Set --no-cache even for apk del as @tags confuse cache

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

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
 

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
 

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

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
 

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
 

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 {} +
 

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

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

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

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

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
 

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

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

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

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/*