Disassembler/Spotter-VM
1
0
Fork 0
Code Issues 78 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Disassembler 2018-01-29 16:47:27 +01:00
parent 8a29b66c85
commit 35ca12b96a
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
16 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq/Dockerfile
View File

@ -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/jre/bin/java \
&& paxctl -cm /usr/lib/jvm/java-1.8-openjdk/bin/java \ && paxctl -cm /usr/lib/jvm/java-1.8-openjdk/bin/java \
# Cleanup # Cleanup
&& apk del paxctl && apk --no-cache del paxctl
RUN \ RUN \
# Download and install ActiveMQ # Download and install ActiveMQ

2
ckan-datapusher/Dockerfile
View File

@ -27,7 +27,7 @@ RUN \
&& adduser -S -u 8004 -h /srv/ckan-datapusher -s /bin/false -g ckan-datapusher -G ckan-datapusher ckan-datapusher \ && 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 \ && chown -R ckan-datapusher:ckan-datapusher /srv/ckan-datapusher \
# Cleanup # Cleanup
&& apk del .deps \ && apk --no-cache del .deps \
&& find /srv/ckan-datapusher/src -name '.git*' -exec rm -rf {} + \ && find /srv/ckan-datapusher/src -name '.git*' -exec rm -rf {} + \
&& rm -rf /root/.cache && rm -rf /root/.cache

2
ckan/Dockerfile
View File

@ -43,7 +43,7 @@ RUN \
&& adduser -S -u 8003 -h /srv/ckan -s /bin/false -g ckan -G ckan ckan \ && adduser -S -u 8003 -h /srv/ckan -s /bin/false -g ckan -G ckan ckan \
&& chown -R ckan:ckan /srv/ckan \ && chown -R ckan:ckan /srv/ckan \
# Cleanup # Cleanup
&& apk del .deps \ && apk --no-cache del .deps \
&& find /srv/ckan/src -name '.git*' -exec rm -rf {} + \ && find /srv/ckan/src -name '.git*' -exec rm -rf {} + \
&& rm -rf /root/.cache && rm -rf /root/.cache

6
crisiscleanup/Dockerfile
View File

@ -7,7 +7,7 @@ RUN \
# Fix grsec attributes to loosen memory protection restrictions # Fix grsec attributes to loosen memory protection restrictions
&& paxctl -cm /usr/bin/node \ && paxctl -cm /usr/bin/node \
# Cleanup # Cleanup
&& apk del paxctl && apk --no-cache del paxctl
RUN \ RUN \
# Install Ruby runtime dependencies # Install Ruby runtime dependencies
@ -37,7 +37,7 @@ RUN \
# Cleanup # Cleanup
&& cd /tmp \ && cd /tmp \
&& rm -r /usr/src/ruby \ && rm -r /usr/src/ruby \
&& apk del .deps \ && apk --no-cache del .deps \
&& rm -rf /root/.gem && rm -rf /root/.gem
ENV RAILS_ENV production ENV RAILS_ENV production
@ -69,7 +69,7 @@ RUN \
&& adduser -S -u 8005 -h /srv/crisiscleanup -s /bin/false -g crisiscleanup -G crisiscleanup crisiscleanup \ && adduser -S -u 8005 -h /srv/crisiscleanup -s /bin/false -g crisiscleanup -G crisiscleanup crisiscleanup \
&& chown -R crisiscleanup:crisiscleanup /srv/crisiscleanup \ && chown -R crisiscleanup:crisiscleanup /srv/crisiscleanup \
# Cleanup # Cleanup
&& apk del .deps \ && apk --no-cache del .deps \
&& find /srv/crisiscleanup -name '.git*' -exec rm -rf {} + \ && find /srv/crisiscleanup -name '.git*' -exec rm -rf {} + \
&& rm -rf /usr/local/share/.cache \ && rm -rf /usr/local/share/.cache \
&& rm -rf /root/.bundle /root/.config /root/.npm && rm -rf /root/.bundle /root/.config /root/.npm

2
cts/Dockerfile
View File

@ -32,7 +32,7 @@ RUN \
&& adduser -S -u 8006 -h /srv/cts -s /bin/false -g cts -G cts cts \ && adduser -S -u 8006 -h /srv/cts -s /bin/false -g cts -G cts cts \
&& chown -R cts:cts /srv/cts \ && chown -R cts:cts /srv/cts \
# Cleanup # Cleanup
&& apk del .deps \ && apk --no-cache del .deps \
&& find /srv/cts -name '.git*' -exec rm -rf {} + \ && find /srv/cts -name '.git*' -exec rm -rf {} + \
&& rm -rf /root/.cache && rm -rf /root/.cache

2
gnuhealth/Dockerfile
View File

@ -37,7 +37,7 @@ RUN \
&& sudo -u gnuhealth npm install --production \ && sudo -u gnuhealth npm install --production \
&& sudo -u gnuhealth ./node_modules/.bin/grunt \ && sudo -u gnuhealth ./node_modules/.bin/grunt \
# Cleanup # Cleanup
&& apk del .deps \ && apk --no-cache del .deps \
&& find /srv/gnuhealth -name '.git*' -exec rm -rf {} + \ && find /srv/gnuhealth -name '.git*' -exec rm -rf {} + \
&& rm -rf /usr/local/share/.cache && rm -rf /usr/local/share/.cache

2
kanboard/Dockerfile
View File

@ -35,7 +35,7 @@ RUN \
&& addgroup -S -g 8009 kanboard \ && addgroup -S -g 8009 kanboard \
&& adduser -S -u 8009 -h /srv/kanboard -s /bin/false -g kanboard -G kanboard kanboard \ && adduser -S -u 8009 -h /srv/kanboard -s /bin/false -g kanboard -G kanboard kanboard \
# Cleanup # Cleanup
&& apk del .deps \ && apk --no-cache del .deps \
&& rm -f /srv/kanboard.zip \ && rm -f /srv/kanboard.zip \
&& find /srv/kanboard -name '.git*' -exec rm -rf {} + && find /srv/kanboard -name '.git*' -exec rm -rf {} +

2
mifosx/Dockerfile
View File

@ -22,7 +22,7 @@ RUN \
&& adduser -S -u 8012 -h /srv/tomcat -s /bin/false -g mifosx -G mifosx mifosx \ && 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 \ && chown -R mifosx:mifosx /srv/tomcat/conf /srv/tomcat/logs /srv/tomcat/temp /srv/tomcat/webapps /srv/tomcat/work \
# Cleanup # Cleanup
&& apk del wget \ && apk --no-cache del wget \
&& rm -rf /tmp/fineractplatform-17.07.01.RELEASE /tmp/mifosx.zip && rm -rf /tmp/fineractplatform-17.07.01.RELEASE /tmp/mifosx.zip
EXPOSE 8012 EXPOSE 8012

6
openmapkit/Dockerfile
View File

@ -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/jre/bin/java \
&& paxctl -cm /usr/lib/jvm/java-1.8-openjdk/bin/java \ && paxctl -cm /usr/lib/jvm/java-1.8-openjdk/bin/java \
# Cleanup # Cleanup
&& apk del paxctl && apk --no-cache del paxctl
RUN \ RUN \
# Install NodeJS runtime # Install NodeJS runtime
@ -16,7 +16,7 @@ RUN \
# Fix grsec attributes to loosen memory protection restrictions # Fix grsec attributes to loosen memory protection restrictions
&& paxctl -cm /usr/bin/node \ && paxctl -cm /usr/bin/node \
# Cleanup # Cleanup
&& apk del paxctl && apk --no-cache del paxctl
RUN \ RUN \
# Install Python2 runtime # Install Python2 runtime
@ -38,7 +38,7 @@ RUN \
&& adduser -S -u 8007 -h /srv/openmapkit -s /bin/false -g omk -G omk omk \ && adduser -S -u 8007 -h /srv/openmapkit -s /bin/false -g omk -G omk omk \
&& chown -R omk:omk /srv/openmapkit \ && chown -R omk:omk /srv/openmapkit \
# Cleanup # Cleanup
&& apk del .deps \ && apk --no-cache del .deps \
&& find /srv/openmapkit -name '.git*' -exec rm -rf {} + \ && find /srv/openmapkit -name '.git*' -exec rm -rf {} + \
&& rm -rf /usr/local/share/.cache \ && rm -rf /usr/local/share/.cache \
&& rm -rf /root/.cache /root/.config /root/.node-gyp /root/.npm && rm -rf /root/.cache /root/.config /root/.node-gyp /root/.npm

2
pandora/Dockerfile
View File

@ -64,7 +64,7 @@ RUN \
&& adduser -S -u 8002 -h /srv/pandora -s /bin/false -g pandora -G pandora pandora \ && adduser -S -u 8002 -h /srv/pandora -s /bin/false -g pandora -G pandora pandora \
&& chown -R 8002:8002 /srv/pandora \ && chown -R 8002:8002 /srv/pandora \
# Cleanup # Cleanup
&& apk del .deps \ && apk --no-cache del .deps \
&& find /srv/pandora -name '.git*' -exec rm -rf {} + \ && find /srv/pandora -name '.git*' -exec rm -rf {} + \
&& rm -rf /tmp/lib* /tmp/oxframe \ && rm -rf /tmp/lib* /tmp/oxframe \
&& rm -rf /root/.cache /root/.ox && rm -rf /root/.cache /root/.ox

2
sahana/Dockerfile
View File

@ -43,7 +43,7 @@ RUN \
&& adduser -S -u 8001 -h /srv/web2py -s /bin/false -g sahana -G sahana sahana \ && adduser -S -u 8001 -h /srv/web2py -s /bin/false -g sahana -G sahana sahana \
&& chown -R sahana:sahana /srv/web2py \ && chown -R sahana:sahana /srv/web2py \
# Cleanup # Cleanup
&& apk del .deps \ && apk --no-cache del .deps \
&& find /srv/web2py -name '.git*' -exec rm -rf {} + \ && find /srv/web2py -name '.git*' -exec rm -rf {} + \
&& rm -r /srv/web2py/applications/admin /srv/web2py/applications/examples /srv/web2py/applications/welcome \ && rm -r /srv/web2py/applications/admin /srv/web2py/applications/examples /srv/web2py/applications/welcome \
&& rm -r /root/.cache && rm -r /root/.cache

2
seeddms/Dockerfile
View File

@ -28,7 +28,7 @@ RUN \
&& addgroup -S -g 8010 seeddms \ && addgroup -S -g 8010 seeddms \
&& adduser -S -u 8010 -h /srv/seeddms -s /bin/false -g seeddms -G seeddms seeddms \ && adduser -S -u 8010 -h /srv/seeddms -s /bin/false -g seeddms -G seeddms seeddms \
# Cleanup # Cleanup
&& apk del wget \ && apk --no-cache del wget \
&& cp /srv/seeddms/www/install/create_tables-postgres.sql /srv/seeddms/create_tables-postgres.sql \ && cp /srv/seeddms/www/install/create_tables-postgres.sql /srv/seeddms/create_tables-postgres.sql \
&& rm -rf /srv/seeddms/www/install && rm -rf /srv/seeddms/www/install

2
sigmah.sh
View File

@ -28,7 +28,7 @@ export SIGMAH_ADMIN_EMAIL=admin@example.com
export SIGMAH_ADMIN_PWD=$(head -c 12 /dev/urandom | base64) export SIGMAH_ADMIN_PWD=$(head -c 12 /dev/urandom | base64)
apk --no-cache add apache2-utils apk --no-cache add apache2-utils
export SIGMAH_ADMIN_HASH=$(htpasswd -bnBC 10 "" ${SIGMAH_ADMIN_PWD} | tr -d ':\n' | tr '$2y' '$2a') 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|§OrganizationName§|Demo organization|g" /tmp/sigmah-newOrganizationLaunchScript.sql
sed -i "s|§OrganizationLogoFilename§|logo.png|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 sed -i "s|§HeadquartersCountryCode§|CZ|g" /tmp/sigmah-newOrganizationLaunchScript.sql

2
solr/Dockerfile
View File

@ -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/jre/bin/java \
&& paxctl -cm /usr/lib/jvm/java-1.8-openjdk/bin/java \ && paxctl -cm /usr/lib/jvm/java-1.8-openjdk/bin/java \
# Cleanup # Cleanup
&& apk del paxctl && apk --no-cache del paxctl
RUN \ RUN \
# Install runtime dependencies # Install runtime dependencies

2
tomcat/Dockerfile
View File

@ -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/jre/bin/java \
&& paxctl -cm /usr/lib/jvm/java-1.8-openjdk/bin/java \ && paxctl -cm /usr/lib/jvm/java-1.8-openjdk/bin/java \
# Cleanup # Cleanup
&& apk del paxctl && apk --no-cache del paxctl
RUN \ RUN \
# Install Tomcat 8 # Install Tomcat 8

2
zz-cleanup.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# Remove packages not necessary for release # Remove packages not necessary for release
apk del .useful apk --no-cache del .useful
# Clean package cache # Clean package cache
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*