Merge pull request #643 from am97/main

Build optimizations
maxking · Nov 13, 2023 · d97abcd · d97abcd
2 parents 635ef2f + 02b8ed2
commit d97abcd
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 35 deletions.
diff --git a/core/Dockerfile b/core/Dockerfile
@@ -2,9 +2,6 @@
 # Use 3.15 for Core since it has Python 3.9
 FROM alpine:3.18
 
-#Add startup script to container
-COPY docker-entrypoint.sh /usr/local/bin/
-
 # Add requirements file.
 COPY requirements.txt /tmp/
 
@@ -25,6 +22,9 @@ RUN --mount=type=cache,target=/root/.cache \
     && apk del build-deps \
     && adduser -S mailman
 
+#Add startup script to container
+COPY docker-entrypoint.sh /usr/local/bin/
+
 # Change the working directory.
 WORKDIR /opt/mailman
 

diff --git a/core/Dockerfile.dev b/core/Dockerfile.dev
@@ -2,14 +2,10 @@
 # Use 3.15 for Core since it has Python 3.9
 FROM alpine:3.18
 
-#Add startup script to container
-COPY docker-entrypoint.sh /usr/local/bin/
-
 # Set the commits that we are building.
 ARG CORE_REF
 ARG MM3_HK_REF
 
-
 #Install all required packages, add user for executing mailman and set execution
 #rights for startup script
 RUN --mount=type=cache,target=/root/.cache \
@@ -26,6 +22,9 @@ RUN --mount=type=cache,target=/root/.cache \
     && apk del build-deps \
     && adduser -S mailman
 
+#Add startup script to container
+COPY docker-entrypoint.sh /usr/local/bin/
+
 # Change the working directory.
 WORKDIR /opt/mailman
 

diff --git a/postorius/Dockerfile b/postorius/Dockerfile
@@ -1,11 +1,6 @@
 # syntax = docker/dockerfile:1.3
 FROM alpine:3.18.4
 
-# Add needed files for uwsgi server + settings for django
-COPY mailman-web /opt/mailman-web
-# Add startup script to container
-COPY docker-entrypoint.sh /usr/local/bin/
-
 # Install packages and dependencies for postorius and hyperkitty Add user for
 # executing apps, change ownership for uwsgi+django files and set execution
 # rights for management script
@@ -28,8 +23,14 @@ RUN --mount=type=cache,target=/root/.cache \
   		tzdata \
 	&& apk del .build-deps \
 	&& addgroup -S mailman \
-	&& adduser -S -G mailman mailman \
-	&& chown -R mailman /opt/mailman-web/ \
+	&& adduser -S -G mailman mailman
+
+# Add needed files for uwsgi server + settings for django
+COPY mailman-web /opt/mailman-web
+# Add startup script to container
+COPY docker-entrypoint.sh /usr/local/bin/
+
+RUN chown -R mailman /opt/mailman-web/ \
 	&& chmod u+x /opt/mailman-web/manage.py
 
 WORKDIR /opt/mailman-web

diff --git a/postorius/Dockerfile.dev b/postorius/Dockerfile.dev
@@ -1,11 +1,6 @@
 # syntax = docker/dockerfile:1.3
 FROM alpine:3.18.4
 
-# Add needed files for uwsgi server + settings for django
-COPY mailman-web /opt/mailman-web
-# Add startup script to container
-COPY docker-entrypoint.sh /usr/local/bin/
-
 ARG POSTORIUS_REF
 ARG DJ_MM3_REF
 ARG CLIENT_REF
@@ -35,8 +30,14 @@ RUN --mount=type=cache,target=/root/.cache \
        git+https://gitlab.com/mailman/django-mailman3 \
 	&& apk del .build-deps \
 	&& addgroup -S mailman \
-	&& adduser -S -G mailman mailman \
-	&& chown -R mailman /opt/mailman-web/ \
+	&& adduser -S -G mailman mailman
+
+# Add needed files for uwsgi server + settings for django
+COPY mailman-web /opt/mailman-web
+# Add startup script to container
+COPY docker-entrypoint.sh /usr/local/bin/
+
+RUN chown -R mailman /opt/mailman-web/ \
 	&& chmod u+x /opt/mailman-web/manage.py
 
 WORKDIR /opt/mailman-web

diff --git a/web/Dockerfile b/web/Dockerfile
@@ -1,10 +1,6 @@
 # syntax = docker/dockerfile:1.3
 FROM alpine:3.18.4
 
-# Add needed files for uwsgi server + settings for django
-COPY mailman-web /opt/mailman-web
-# Add startup script to container
-COPY docker-entrypoint.sh /usr/local/bin/
 # Add requirements file.
 COPY requirements.txt /tmp/
 
@@ -34,8 +30,14 @@ RUN --mount=type=cache,target=/root/.cache \
 		tzdata \
 	&& apk del .build-deps \
 	&& addgroup -S mailman \
-	&& adduser -S -G mailman mailman \
-	&& chown -R mailman /opt/mailman-web/ \
+	&& adduser -S -G mailman mailman
+
+# Add needed files for uwsgi server + settings for django
+COPY mailman-web /opt/mailman-web
+# Add startup script to container
+COPY docker-entrypoint.sh /usr/local/bin/
+
+RUN chown -R mailman /opt/mailman-web/ \
 	&& chmod u+x /opt/mailman-web/manage.py
 
 WORKDIR /opt/mailman-web

diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev
@@ -1,11 +1,6 @@
 # syntax = docker/dockerfile:1.3
 FROM alpine:3.18.4
 
-# Add needed files for uwsgi server + settings for django
-COPY mailman-web /opt/mailman-web
-# Add startup script to container
-COPY docker-entrypoint.sh /usr/local/bin/
-
 ARG POSTORIUS_REF
 ARG HYPERKITTY_REF
 ARG DJ_MM3_REF
@@ -42,9 +37,15 @@ RUN --mount=type=cache,target=/root/.cache \
        git+https://gitlab.com/mailman/django-mailman3 \
     && apk del .build-deps \
     && addgroup -S mailman \
-    && adduser -S -G mailman mailman \
-    && chown -R mailman /opt/mailman-web/ \
-    && chmod u+x /opt/mailman-web/manage.py
+    && adduser -S -G mailman mailman
+
+# Add needed files for uwsgi server + settings for django
+COPY mailman-web /opt/mailman-web
+# Add startup script to container
+COPY docker-entrypoint.sh /usr/local/bin/
+
+RUN chown -R mailman /opt/mailman-web/ \
+	&& chmod u+x /opt/mailman-web/manage.py
 
 WORKDIR /opt/mailman-web