fix: alpine builds

Hans Tuscher · Hans Tuscher · commit b5ca3d554b48 · 2024-06-28T23:12:13.000+02:00
diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile b/docker/php-apache-dev/8.0-alpine/Dockerfile
@@ -35,5 +35,4 @@ RUN set -x \
     && docker-service enable syslog \
     && docker-service enable postfix \
     && docker-service enable ssh \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2
@@ -8,5 +8,4 @@
 
 RUN set -x \
     {{ php.officialDevelopmentAlpine(version="8.0") }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
diff --git a/docker/php-apache-dev/8.1-alpine/Dockerfile b/docker/php-apache-dev/8.1-alpine/Dockerfile
@@ -35,5 +35,4 @@ RUN set -x \
     && docker-service enable syslog \
     && docker-service enable postfix \
     && docker-service enable ssh \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
diff --git a/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2
@@ -8,5 +8,4 @@
 
 RUN set -x \
     {{ php.officialDevelopmentAlpine(version="8.1") }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
diff --git a/docker/php-apache-dev/8.2-alpine/Dockerfile b/docker/php-apache-dev/8.2-alpine/Dockerfile
@@ -35,5 +35,4 @@ RUN set -x \
     && docker-service enable syslog \
     && docker-service enable postfix \
     && docker-service enable ssh \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
diff --git a/docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2
@@ -8,5 +8,4 @@
 
 RUN set -x \
     {{ php.officialDevelopmentAlpine(version="8.2") }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
diff --git a/docker/php-apache-dev/8.3-alpine/Dockerfile b/docker/php-apache-dev/8.3-alpine/Dockerfile
@@ -35,5 +35,4 @@ RUN set -x \
     && docker-service enable syslog \
     && docker-service enable postfix \
     && docker-service enable ssh \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
diff --git a/docker/php-apache-dev/8.3-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.3-alpine/Dockerfile.jinja2
@@ -8,5 +8,4 @@
 
 RUN set -x \
     {{ php.officialDevelopmentAlpine(version="8.3") }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
diff --git a/docker/php-apache/8.0-alpine/Dockerfile b/docker/php-apache/8.0-alpine/Dockerfile
@@ -28,7 +28,6 @@ RUN set -x \
         s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
         s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
         ' /etc/apache2/httpd.conf \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
 
 EXPOSE 80 443
diff --git a/docker/php-apache/8.0-alpine/Dockerfile.jinja2 b/docker/php-apache/8.0-alpine/Dockerfile.jinja2
@@ -7,7 +7,6 @@
 
 RUN set -x \
     {{ apache.alpine() }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache/8.1-alpine/Dockerfile b/docker/php-apache/8.1-alpine/Dockerfile
@@ -28,7 +28,6 @@ RUN set -x \
         s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
         s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
         ' /etc/apache2/httpd.conf \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
 
 EXPOSE 80 443
diff --git a/docker/php-apache/8.1-alpine/Dockerfile.jinja2 b/docker/php-apache/8.1-alpine/Dockerfile.jinja2
@@ -7,7 +7,6 @@
 
 RUN set -x \
     {{ apache.alpine() }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache/8.2-alpine/Dockerfile b/docker/php-apache/8.2-alpine/Dockerfile
@@ -28,7 +28,6 @@ RUN set -x \
         s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
         s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
         ' /etc/apache2/httpd.conf \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
 
 EXPOSE 80 443
diff --git a/docker/php-apache/8.2-alpine/Dockerfile.jinja2 b/docker/php-apache/8.2-alpine/Dockerfile.jinja2
@@ -7,7 +7,6 @@
 
 RUN set -x \
     {{ apache.alpine() }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache/8.3-alpine/Dockerfile b/docker/php-apache/8.3-alpine/Dockerfile
@@ -28,7 +28,6 @@ RUN set -x \
         s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
         s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
         ' /etc/apache2/httpd.conf \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
 
 EXPOSE 80 443
diff --git a/docker/php-apache/8.3-alpine/Dockerfile.jinja2 b/docker/php-apache/8.3-alpine/Dockerfile.jinja2
@@ -7,7 +7,6 @@
 
 RUN set -x \
     {{ apache.alpine() }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-dev/8.0-alpine/Dockerfile b/docker/php-dev/8.0-alpine/Dockerfile
@@ -27,5 +27,4 @@ RUN set -x \
     && docker-service enable syslog \
     && docker-service enable postfix \
     && docker-service enable ssh \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
diff --git a/docker/php-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-dev/8.0-alpine/Dockerfile.jinja2
@@ -4,5 +4,4 @@
 
 RUN set -x \
     {{ php.officialDevelopmentAlpine(version="8.0") }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
diff --git a/docker/php-dev/8.1-alpine/Dockerfile b/docker/php-dev/8.1-alpine/Dockerfile
@@ -27,5 +27,4 @@ RUN set -x \
     && docker-service enable syslog \
     && docker-service enable postfix \
     && docker-service enable ssh \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
diff --git a/docker/php-dev/8.1-alpine/Dockerfile.jinja2 b/docker/php-dev/8.1-alpine/Dockerfile.jinja2
@@ -4,5 +4,4 @@
 
 RUN set -x \
     {{ php.officialDevelopmentAlpine(version="8.1") }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
diff --git a/docker/php-dev/8.2-alpine/Dockerfile b/docker/php-dev/8.2-alpine/Dockerfile
@@ -27,5 +27,4 @@ RUN set -x \
     && docker-service enable syslog \
     && docker-service enable postfix \
     && docker-service enable ssh \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
diff --git a/docker/php-dev/8.2-alpine/Dockerfile.jinja2 b/docker/php-dev/8.2-alpine/Dockerfile.jinja2
@@ -4,5 +4,4 @@
 
 RUN set -x \
     {{ php.officialDevelopmentAlpine(version="8.2") }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
diff --git a/docker/php-dev/8.3-alpine/Dockerfile b/docker/php-dev/8.3-alpine/Dockerfile
@@ -27,5 +27,4 @@ RUN set -x \
     && docker-service enable syslog \
     && docker-service enable postfix \
     && docker-service enable ssh \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
diff --git a/docker/php-dev/8.3-alpine/Dockerfile.jinja2 b/docker/php-dev/8.3-alpine/Dockerfile.jinja2
@@ -4,5 +4,4 @@
 
 RUN set -x \
     {{ php.officialDevelopmentAlpine(version="8.3") }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile b/docker/php-nginx-dev/8.0-alpine/Dockerfile
@@ -35,5 +35,4 @@ RUN set -x \
     && docker-service enable syslog \
     && docker-service enable postfix \
     && docker-service enable ssh \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2
@@ -8,5 +8,4 @@
 
 RUN set -x \
     {{ php.officialDevelopmentAlpine(version="8.0") }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
diff --git a/docker/php-nginx-dev/8.1-alpine/Dockerfile b/docker/php-nginx-dev/8.1-alpine/Dockerfile
@@ -35,5 +35,4 @@ RUN set -x \
     && docker-service enable syslog \
     && docker-service enable postfix \
     && docker-service enable ssh \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
diff --git a/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2
@@ -8,5 +8,4 @@
 
 RUN set -x \
     {{ php.officialDevelopmentAlpine(version="8.1") }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
diff --git a/docker/php-nginx-dev/8.2-alpine/Dockerfile b/docker/php-nginx-dev/8.2-alpine/Dockerfile
@@ -35,5 +35,4 @@ RUN set -x \
     && docker-service enable syslog \
     && docker-service enable postfix \
     && docker-service enable ssh \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
diff --git a/docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2
@@ -8,5 +8,4 @@
 
 RUN set -x \
     {{ php.officialDevelopmentAlpine(version="8.2") }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
diff --git a/docker/php-nginx-dev/8.3-alpine/Dockerfile b/docker/php-nginx-dev/8.3-alpine/Dockerfile
@@ -35,5 +35,4 @@ RUN set -x \
     && docker-service enable syslog \
     && docker-service enable postfix \
     && docker-service enable ssh \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
diff --git a/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2
@@ -8,5 +8,4 @@
 
 RUN set -x \
     {{ php.officialDevelopmentAlpine(version="8.2") }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
diff --git a/docker/php-nginx/8.0-alpine/Dockerfile b/docker/php-nginx/8.0-alpine/Dockerfile
@@ -19,7 +19,6 @@ RUN set -x \
     # Install nginx
     && apk-install \
         nginx \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
 
 EXPOSE 80 443
diff --git a/docker/php-nginx/8.0-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.0-alpine/Dockerfile.jinja2
@@ -8,7 +8,6 @@
 
 RUN set -x \
     {{ nginx.alpine() }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx/8.1-alpine/Dockerfile b/docker/php-nginx/8.1-alpine/Dockerfile
@@ -19,7 +19,6 @@ RUN set -x \
     # Install nginx
     && apk-install \
         nginx \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
 
 EXPOSE 80 443
diff --git a/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.1-alpine/Dockerfile.jinja2
@@ -8,7 +8,6 @@
 
 RUN set -x \
     {{ nginx.alpine() }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx/8.2-alpine/Dockerfile b/docker/php-nginx/8.2-alpine/Dockerfile
@@ -19,7 +19,6 @@ RUN set -x \
     # Install nginx
     && apk-install \
         nginx \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
 
 EXPOSE 80 443
diff --git a/docker/php-nginx/8.2-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.2-alpine/Dockerfile.jinja2
@@ -8,7 +8,6 @@
 
 RUN set -x \
     {{ nginx.alpine() }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx/8.3-alpine/Dockerfile b/docker/php-nginx/8.3-alpine/Dockerfile
@@ -19,7 +19,6 @@ RUN set -x \
     # Install nginx
     && apk-install \
         nginx \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
 
 EXPOSE 80 443
diff --git a/docker/php-nginx/8.3-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.3-alpine/Dockerfile.jinja2
@@ -8,7 +8,6 @@
 
 RUN set -x \
     {{ nginx.alpine() }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
 
 {{ docker.expose('80 443') }}
