Revert CrisisCleanup bump to Alpine 3.10

This commit is contained in:
Disassembler 2020-03-22 12:38:38 +01:00
parent ef52c066d2
commit 3e8032d867
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
2 changed files with 4 additions and 7 deletions

View File

@ -1,6 +1,6 @@
IMAGE crisiscleanup_2.2.0-200313 IMAGE crisiscleanup_2.2.0-200313
FROM alpine3.10-ruby2.4_2.4.9-200313 FROM alpine3.8-ruby2.4_2.4.9-200313
# yarn dependencies installation fails on nodejs>10 # yarn dependencies installation fails on nodejs>8
ENV RAILS_ENV production ENV RAILS_ENV production
@ -18,9 +18,6 @@ RUN EOF
sed -i 's/ruby "2\.4\.4"/ruby "2.4.9"/' /srv/crisiscleanup/Gemfile sed -i 's/ruby "2\.4\.4"/ruby "2.4.9"/' /srv/crisiscleanup/Gemfile
gem install bundler:1.16.6 gem install bundler:1.16.6
# Hackfix nodejs version requirement
sed -i 's/8\.x/10.x/' /srv/crisiscleanup/package.json
# Install Ruby and NodeJS dependencies # Install Ruby and NodeJS dependencies
cd /srv/crisiscleanup cd /srv/crisiscleanup
bundle config build.nokogiri --use-system-libraries bundle config build.nokogiri --use-system-libraries

View File

@ -1,5 +1,5 @@
IMAGE alpine3.10-ruby2.4_2.4.9-200313 IMAGE alpine3.8-ruby2.4_2.4.9-200313
FROM alpine3.10_3.10.4-200313 FROM alpine3.8_3.8.5-200313
RUN EOF RUN EOF
# Install Ruby runtime dependencies # Install Ruby runtime dependencies