Freeze CC version

This commit is contained in:
Disassembler 2018-09-12 19:42:12 +02:00
parent 344b6be624
commit 6583acc129
No known key found for this signature in database
GPG Key ID: 524BD33A0EE29499
2 changed files with 4 additions and 2 deletions

View File

@ -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 apk --no-cache add --virtual .deps build-base git libxml2-dev libxslt-dev linux-headers npm postgresql-dev yarn zlib-dev
# Clone CrisisCleanup # 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 # Hackfix ruby and nodejs dependency versions
sed -i 's/2\.2\.5/2.3.6/' /srv/crisiscleanup/Gemfile sed -i 's/2\.2\.5/2.3.6/' /srv/crisiscleanup/Gemfile

View File

@ -29,7 +29,7 @@ def fix_world(layers):
with open(os.path.join(layer, 'etc/apk/world'), 'r') as fd: with open(os.path.join(layer, 'etc/apk/world'), 'r') as fd:
for line in fd: for line in fd:
if line not in world: if line not in world:
world.append(world) world.append(line)
except: except:
continue continue
os.makedirs(os.path.join(layers[-1], 'etc/apk'), 0o755, True) os.makedirs(os.path.join(layers[-1], 'etc/apk'), 0o755, True)