Skip to content

Commit 84d6dce

Browse files
authored
Merge pull request #1655 from BallAerospace/container_deps
Bump alpine build, move ruby-dev to cosmos-ruby
2 parents 750a34d + 2b660ad commit 84d6dce

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ALPINE_VERSION=3.15
2-
ALPINE_BUILD=0
2+
ALPINE_BUILD=4
33
APK_URL=https://dl-cdn.alpinelinux.org
44
RUBYGEMS_URL=https://rubygems.org
55
NPM_URL=https://registry.npmjs.org

cosmos-ruby/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ RUN cp /root/.gemrc /etc/.gemrc
3939

4040
RUN apk update \
4141
&& apk add ruby \
42+
build-base \
43+
ruby-dev \
44+
libressl-dev \
4245
ruby-etc \
4346
ruby-bigdecimal \
4447
ruby-io-console \
@@ -52,7 +55,7 @@ RUN apk update \
5255
git \
5356
libxml2-dev \
5457
libxslt-dev \
55-
&& gem update --system 3.3.13 \
58+
&& gem update --system 3.3.14 \
5659
&& gem install rake \
5760
&& gem cleanup \
5861
&& bundle config build.nokogiri --use-system-libraries \

cosmos/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ USER root
1313

1414
RUN mkdir -p lib/cosmos/ext \
1515
&& git config --global http.sslCAinfo /devel/cacert.pem \
16-
&& apk add build-base ruby-dev libressl-dev \
1716
&& bundle config set --local without 'development' \
1817
&& bundle install --quiet \
1918
&& rake gems \

0 commit comments

Comments
 (0)