From 6583acc12918a0b7011523196a8b5ac6968a68fe Mon Sep 17 00:00:00 2001 From: Disassembler Date: Wed, 12 Sep 2018 19:42:12 +0200 Subject: [PATCH] Freeze CC version --- crisiscleanup/lxcfile | 4 +++- zz-extra/fix-apk | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/crisiscleanup/lxcfile b/crisiscleanup/lxcfile index b6f48ec..11c12d0 100644 --- a/crisiscleanup/lxcfile +++ b/crisiscleanup/lxcfile @@ -17,7 +17,9 @@ RUN EOF apk --no-cache add --virtual .deps build-base git libxml2-dev libxslt-dev linux-headers npm postgresql-dev yarn zlib-dev # Clone CrisisCleanup - git clone --depth 1 https://github.com/CrisisCleanup/crisiscleanup /srv/crisiscleanup + git clone --depth 50 https://github.com/CrisisCleanup/crisiscleanup /srv/crisiscleanup + # TODO: Update ruby version + git -C /srv/crisiscleanup checkout b9035bd44fff371ea3d525eb560ff45504acaee7 # Hackfix ruby and nodejs dependency versions sed -i 's/2\.2\.5/2.3.6/' /srv/crisiscleanup/Gemfile diff --git a/zz-extra/fix-apk b/zz-extra/fix-apk index 992f8b5..0b9199d 100755 --- a/zz-extra/fix-apk +++ b/zz-extra/fix-apk @@ -29,7 +29,7 @@ def fix_world(layers): with open(os.path.join(layer, 'etc/apk/world'), 'r') as fd: for line in fd: if line not in world: - world.append(world) + world.append(line) except: continue os.makedirs(os.path.join(layers[-1], 'etc/apk'), 0o755, True)