From 35ca12b96a6341616299d1931ea1d19e7f675df7 Mon Sep 17 00:00:00 2001 From: Disassembler Date: Mon, 29 Jan 2018 16:47:27 +0100 Subject: [PATCH] Set --no-cache even for apk del as @tags confuse cache --- activemq/Dockerfile | 2 +- ckan-datapusher/Dockerfile | 2 +- ckan/Dockerfile | 2 +- crisiscleanup/Dockerfile | 6 +++--- cts/Dockerfile | 2 +- gnuhealth/Dockerfile | 2 +- kanboard/Dockerfile | 2 +- mifosx/Dockerfile | 2 +- openmapkit/Dockerfile | 6 +++--- pandora/Dockerfile | 2 +- sahana/Dockerfile | 2 +- seeddms/Dockerfile | 2 +- sigmah.sh | 2 +- solr/Dockerfile | 2 +- tomcat/Dockerfile | 2 +- zz-cleanup.sh | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/activemq/Dockerfile b/activemq/Dockerfile index 64e0bdb..139b173 100644 --- a/activemq/Dockerfile +++ b/activemq/Dockerfile @@ -8,7 +8,7 @@ RUN \ && paxctl -cm /usr/lib/jvm/java-1.8-openjdk/jre/bin/java \ && paxctl -cm /usr/lib/jvm/java-1.8-openjdk/bin/java \ # Cleanup - && apk del paxctl + && apk --no-cache del paxctl RUN \ # Download and install ActiveMQ diff --git a/ckan-datapusher/Dockerfile b/ckan-datapusher/Dockerfile index bf6787b..c2a7357 100644 --- a/ckan-datapusher/Dockerfile +++ b/ckan-datapusher/Dockerfile @@ -27,7 +27,7 @@ RUN \ && adduser -S -u 8004 -h /srv/ckan-datapusher -s /bin/false -g ckan-datapusher -G ckan-datapusher ckan-datapusher \ && chown -R ckan-datapusher:ckan-datapusher /srv/ckan-datapusher \ # Cleanup - && apk del .deps \ + && apk --no-cache del .deps \ && find /srv/ckan-datapusher/src -name '.git*' -exec rm -rf {} + \ && rm -rf /root/.cache diff --git a/ckan/Dockerfile b/ckan/Dockerfile index 7ef6be4..b995208 100644 --- a/ckan/Dockerfile +++ b/ckan/Dockerfile @@ -43,7 +43,7 @@ RUN \ && adduser -S -u 8003 -h /srv/ckan -s /bin/false -g ckan -G ckan ckan \ && chown -R ckan:ckan /srv/ckan \ # Cleanup - && apk del .deps \ + && apk --no-cache del .deps \ && find /srv/ckan/src -name '.git*' -exec rm -rf {} + \ && rm -rf /root/.cache diff --git a/crisiscleanup/Dockerfile b/crisiscleanup/Dockerfile index 815f040..914db48 100644 --- a/crisiscleanup/Dockerfile +++ b/crisiscleanup/Dockerfile @@ -7,7 +7,7 @@ RUN \ # Fix grsec attributes to loosen memory protection restrictions && paxctl -cm /usr/bin/node \ # Cleanup - && apk del paxctl + && apk --no-cache del paxctl RUN \ # Install Ruby runtime dependencies @@ -37,7 +37,7 @@ RUN \ # Cleanup && cd /tmp \ && rm -r /usr/src/ruby \ - && apk del .deps \ + && apk --no-cache del .deps \ && rm -rf /root/.gem ENV RAILS_ENV production @@ -69,7 +69,7 @@ RUN \ && adduser -S -u 8005 -h /srv/crisiscleanup -s /bin/false -g crisiscleanup -G crisiscleanup crisiscleanup \ && chown -R crisiscleanup:crisiscleanup /srv/crisiscleanup \ # Cleanup - && apk del .deps \ + && apk --no-cache del .deps \ && find /srv/crisiscleanup -name '.git*' -exec rm -rf {} + \ && rm -rf /usr/local/share/.cache \ && rm -rf /root/.bundle /root/.config /root/.npm diff --git a/cts/Dockerfile b/cts/Dockerfile index 408a7a5..ba6ab7e 100644 --- a/cts/Dockerfile +++ b/cts/Dockerfile @@ -32,7 +32,7 @@ RUN \ && adduser -S -u 8006 -h /srv/cts -s /bin/false -g cts -G cts cts \ && chown -R cts:cts /srv/cts \ # Cleanup - && apk del .deps \ + && apk --no-cache del .deps \ && find /srv/cts -name '.git*' -exec rm -rf {} + \ && rm -rf /root/.cache diff --git a/gnuhealth/Dockerfile b/gnuhealth/Dockerfile index 4954e1d..af0871b 100644 --- a/gnuhealth/Dockerfile +++ b/gnuhealth/Dockerfile @@ -37,7 +37,7 @@ RUN \ && sudo -u gnuhealth npm install --production \ && sudo -u gnuhealth ./node_modules/.bin/grunt \ # Cleanup - && apk del .deps \ + && apk --no-cache del .deps \ && find /srv/gnuhealth -name '.git*' -exec rm -rf {} + \ && rm -rf /usr/local/share/.cache diff --git a/kanboard/Dockerfile b/kanboard/Dockerfile index fb24e17..012455c 100644 --- a/kanboard/Dockerfile +++ b/kanboard/Dockerfile @@ -35,7 +35,7 @@ RUN \ && addgroup -S -g 8009 kanboard \ && adduser -S -u 8009 -h /srv/kanboard -s /bin/false -g kanboard -G kanboard kanboard \ # Cleanup - && apk del .deps \ + && apk --no-cache del .deps \ && rm -f /srv/kanboard.zip \ && find /srv/kanboard -name '.git*' -exec rm -rf {} + diff --git a/mifosx/Dockerfile b/mifosx/Dockerfile index b590472..d2bf7e4 100644 --- a/mifosx/Dockerfile +++ b/mifosx/Dockerfile @@ -22,7 +22,7 @@ RUN \ && adduser -S -u 8012 -h /srv/tomcat -s /bin/false -g mifosx -G mifosx mifosx \ && chown -R mifosx:mifosx /srv/tomcat/conf /srv/tomcat/logs /srv/tomcat/temp /srv/tomcat/webapps /srv/tomcat/work \ # Cleanup - && apk del wget \ + && apk --no-cache del wget \ && rm -rf /tmp/fineractplatform-17.07.01.RELEASE /tmp/mifosx.zip EXPOSE 8012 diff --git a/openmapkit/Dockerfile b/openmapkit/Dockerfile index 63abf75..14d8ec7 100644 --- a/openmapkit/Dockerfile +++ b/openmapkit/Dockerfile @@ -8,7 +8,7 @@ RUN \ && paxctl -cm /usr/lib/jvm/java-1.8-openjdk/jre/bin/java \ && paxctl -cm /usr/lib/jvm/java-1.8-openjdk/bin/java \ # Cleanup - && apk del paxctl + && apk --no-cache del paxctl RUN \ # Install NodeJS runtime @@ -16,7 +16,7 @@ RUN \ # Fix grsec attributes to loosen memory protection restrictions && paxctl -cm /usr/bin/node \ # Cleanup - && apk del paxctl + && apk --no-cache del paxctl RUN \ # Install Python2 runtime @@ -38,7 +38,7 @@ RUN \ && adduser -S -u 8007 -h /srv/openmapkit -s /bin/false -g omk -G omk omk \ && chown -R omk:omk /srv/openmapkit \ # Cleanup - && apk del .deps \ + && apk --no-cache del .deps \ && find /srv/openmapkit -name '.git*' -exec rm -rf {} + \ && rm -rf /usr/local/share/.cache \ && rm -rf /root/.cache /root/.config /root/.node-gyp /root/.npm diff --git a/pandora/Dockerfile b/pandora/Dockerfile index 59bdc8b..362206d 100644 --- a/pandora/Dockerfile +++ b/pandora/Dockerfile @@ -64,7 +64,7 @@ RUN \ && adduser -S -u 8002 -h /srv/pandora -s /bin/false -g pandora -G pandora pandora \ && chown -R 8002:8002 /srv/pandora \ # Cleanup - && apk del .deps \ + && apk --no-cache del .deps \ && find /srv/pandora -name '.git*' -exec rm -rf {} + \ && rm -rf /tmp/lib* /tmp/oxframe \ && rm -rf /root/.cache /root/.ox diff --git a/sahana/Dockerfile b/sahana/Dockerfile index 7a4aa3c..d6ff9c2 100644 --- a/sahana/Dockerfile +++ b/sahana/Dockerfile @@ -43,7 +43,7 @@ RUN \ && adduser -S -u 8001 -h /srv/web2py -s /bin/false -g sahana -G sahana sahana \ && chown -R sahana:sahana /srv/web2py \ # Cleanup - && apk del .deps \ + && apk --no-cache del .deps \ && find /srv/web2py -name '.git*' -exec rm -rf {} + \ && rm -r /srv/web2py/applications/admin /srv/web2py/applications/examples /srv/web2py/applications/welcome \ && rm -r /root/.cache diff --git a/seeddms/Dockerfile b/seeddms/Dockerfile index 6c00ee6..12a0897 100644 --- a/seeddms/Dockerfile +++ b/seeddms/Dockerfile @@ -28,7 +28,7 @@ RUN \ && addgroup -S -g 8010 seeddms \ && adduser -S -u 8010 -h /srv/seeddms -s /bin/false -g seeddms -G seeddms seeddms \ # Cleanup - && apk del wget \ + && apk --no-cache del wget \ && cp /srv/seeddms/www/install/create_tables-postgres.sql /srv/seeddms/create_tables-postgres.sql \ && rm -rf /srv/seeddms/www/install diff --git a/sigmah.sh b/sigmah.sh index fa1a493..6073417 100755 --- a/sigmah.sh +++ b/sigmah.sh @@ -28,7 +28,7 @@ export SIGMAH_ADMIN_EMAIL=admin@example.com export SIGMAH_ADMIN_PWD=$(head -c 12 /dev/urandom | base64) apk --no-cache add apache2-utils export SIGMAH_ADMIN_HASH=$(htpasswd -bnBC 10 "" ${SIGMAH_ADMIN_PWD} | tr -d ':\n' | tr '$2y' '$2a') -apk del apache2-utils +apk --no-cache del apache2-utils sed -i "s|§OrganizationName§|Demo organization|g" /tmp/sigmah-newOrganizationLaunchScript.sql sed -i "s|§OrganizationLogoFilename§|logo.png|g" /tmp/sigmah-newOrganizationLaunchScript.sql sed -i "s|§HeadquartersCountryCode§|CZ|g" /tmp/sigmah-newOrganizationLaunchScript.sql diff --git a/solr/Dockerfile b/solr/Dockerfile index d1668f1..379325d 100644 --- a/solr/Dockerfile +++ b/solr/Dockerfile @@ -8,7 +8,7 @@ RUN \ && paxctl -cm /usr/lib/jvm/java-1.8-openjdk/jre/bin/java \ && paxctl -cm /usr/lib/jvm/java-1.8-openjdk/bin/java \ # Cleanup - && apk del paxctl + && apk --no-cache del paxctl RUN \ # Install runtime dependencies diff --git a/tomcat/Dockerfile b/tomcat/Dockerfile index 8331276..791d462 100644 --- a/tomcat/Dockerfile +++ b/tomcat/Dockerfile @@ -8,7 +8,7 @@ RUN \ && paxctl -cm /usr/lib/jvm/java-1.8-openjdk/jre/bin/java \ && paxctl -cm /usr/lib/jvm/java-1.8-openjdk/bin/java \ # Cleanup - && apk del paxctl + && apk --no-cache del paxctl RUN \ # Install Tomcat 8 diff --git a/zz-cleanup.sh b/zz-cleanup.sh index 55bd329..9421cbb 100755 --- a/zz-cleanup.sh +++ b/zz-cleanup.sh @@ -1,7 +1,7 @@ #!/bin/sh # Remove packages not necessary for release -apk del .useful +apk --no-cache del .useful # Clean package cache rm -rf /var/cache/apk/*