Skip to content

Commit f9e784a

Browse files
committed
Docker: rearrange Dockerfile
We're seeing problems with the docker image build, so hopefully this will help address them.
1 parent 55d8b91 commit f9e784a

File tree

4 files changed

+7
-19
lines changed

4 files changed

+7
-19
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,3 @@ jobs:
5555
tags: |
5656
${{ steps.get-tag-latest.outputs.tags }}
5757
${{ steps.get-tag-sha.outputs.tags }}
58-
cache-from: type=gha
59-
cache-to: type=gha

Dockerfile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3.4.1
1+
FROM ruby:3.4.1@sha256:45ca46a37e16d4f0b383ff6f400edc7e096361ac05c91ead86481ecc332e665e
22

33
ENV RACK_ENV=production
44
ENV RAILS_ENV=production
@@ -9,13 +9,10 @@ EXPOSE 8080
99

1010
SHELL ["/bin/bash", "-c"]
1111

12-
WORKDIR /app
13-
ADD Gemfile Gemfile.lock /app/
14-
RUN gem install bundler:$BUNDLER_VERSION && bundle install
15-
1612
RUN apt-get update \
1713
&& apt-get install -y --no-install-recommends \
18-
supervisor locales nodejs vim nano \
14+
procps bzip2 libffi-dev libgmp-dev libssl-dev libyaml-dev zlib1g-dev libpq-dev \
15+
build-essential python3-pkg-resources supervisor locales nodejs vim nano \
1916
&& apt-get clean \
2017
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
2118

@@ -39,6 +36,10 @@ RUN curl -fsSLO "$SUPERCRONIC_URL" \
3936
&& mv "$SUPERCRONIC" "/usr/local/bin/${SUPERCRONIC}" \
4037
&& ln -s "/usr/local/bin/${SUPERCRONIC}" /usr/local/bin/supercronic
4138

39+
WORKDIR /app
40+
ADD Gemfile Gemfile.lock /app/
41+
RUN gem install bundler:$BUNDLER_VERSION && bundle install
42+
4243
ADD docker/supervisord.conf /etc/supervisord.conf
4344
ADD docker/start.sh /app/
4445
ADD . /app

Gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ group :development, :test do
4343
gem "coveralls_reborn", require: false
4444
gem "debug"
4545
gem "factory_bot"
46-
gem "pry-byebug"
4746
gem "rspec"
4847
gem "rspec-rails"
4948
gem "simplecov"

Gemfile.lock

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ GEM
9696
bootsnap (1.18.4)
9797
msgpack (~> 1.2)
9898
builder (3.3.0)
99-
byebug (11.1.3)
10099
capybara (3.40.0)
101100
addressable
102101
matrix
@@ -106,7 +105,6 @@ GEM
106105
rack-test (>= 0.6.3)
107106
regexp_parser (>= 1.5, < 3.0)
108107
xpath (~> 3.2)
109-
coderay (1.1.3)
110108
coercible (1.0.0)
111109
descendants_tracker (~> 0.0.1)
112110
concurrent-ruby (1.3.5)
@@ -184,7 +182,6 @@ GEM
184182
net-smtp
185183
marcel (1.0.4)
186184
matrix (0.4.2)
187-
method_source (1.1.0)
188185
mini_mime (1.1.5)
189186
mini_portile2 (2.8.8)
190187
minitest (5.25.4)
@@ -210,12 +207,6 @@ GEM
210207
ast (~> 2.4.1)
211208
racc
212209
pg (1.5.9)
213-
pry (0.14.2)
214-
coderay (~> 1.1)
215-
method_source (~> 1.0)
216-
pry-byebug (3.10.1)
217-
byebug (~> 11.0)
218-
pry (>= 0.13, < 0.15)
219210
psych (5.2.3)
220211
date
221212
stringio
@@ -417,7 +408,6 @@ DEPENDENCIES
417408
httparty
418409
nokogiri (~> 1.18.0)
419410
pg
420-
pry-byebug
421411
puma (~> 6.4)
422412
rack-ssl
423413
rails (~> 8.0.0)

0 commit comments

Comments
 (0)