From 3e8032d867e1259f858820a125501cd1784580b1 Mon Sep 17 00:00:00 2001 From: Disassembler Date: Sun, 22 Mar 2020 12:38:38 +0100 Subject: [PATCH] Revert CrisisCleanup bump to Alpine 3.10 --- lxc-apps/crisiscleanup/image | 7 ++----- lxc-shared/{alpine3.10-ruby2.4 => alpine3.8-ruby2.4}/image | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) rename lxc-shared/{alpine3.10-ruby2.4 => alpine3.8-ruby2.4}/image (92%) diff --git a/lxc-apps/crisiscleanup/image b/lxc-apps/crisiscleanup/image index 14da1f1..71cf8e9 100644 --- a/lxc-apps/crisiscleanup/image +++ b/lxc-apps/crisiscleanup/image @@ -1,6 +1,6 @@ IMAGE crisiscleanup_2.2.0-200313 -FROM alpine3.10-ruby2.4_2.4.9-200313 -# yarn dependencies installation fails on nodejs>10 +FROM alpine3.8-ruby2.4_2.4.9-200313 +# yarn dependencies installation fails on nodejs>8 ENV RAILS_ENV production @@ -18,9 +18,6 @@ RUN EOF sed -i 's/ruby "2\.4\.4"/ruby "2.4.9"/' /srv/crisiscleanup/Gemfile 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 cd /srv/crisiscleanup bundle config build.nokogiri --use-system-libraries diff --git a/lxc-shared/alpine3.10-ruby2.4/image b/lxc-shared/alpine3.8-ruby2.4/image similarity index 92% rename from lxc-shared/alpine3.10-ruby2.4/image rename to lxc-shared/alpine3.8-ruby2.4/image index a02e65f..535b50f 100644 --- a/lxc-shared/alpine3.10-ruby2.4/image +++ b/lxc-shared/alpine3.8-ruby2.4/image @@ -1,5 +1,5 @@ -IMAGE alpine3.10-ruby2.4_2.4.9-200313 -FROM alpine3.10_3.10.4-200313 +IMAGE alpine3.8-ruby2.4_2.4.9-200313 +FROM alpine3.8_3.8.5-200313 RUN EOF # Install Ruby runtime dependencies