🐛 (patches): Attempt to fix #1

ItsNiklas · Sep 24, 2023 · 8a36283 · 8a36283
1 parent f091486
commit 8a36283
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 22 deletions.
diff --git a/domjudge-packaging/docker/domserver/Dockerfile b/domjudge-packaging/docker/domserver/Dockerfile
@@ -40,11 +40,6 @@ RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
 ADD domjudge.tar.gz /domjudge-src
 COPY domserver/build.sh /domjudge-src/build.sh
 
-# Apply patches
-COPY domserver/scripts/patches.sh /scripts/patches.sh
-COPY domserver/scripts/patches.d /scripts/patches.d
-RUN chmod 700 /scripts/patches.sh && /scripts/patches.sh
-
 # Build and install domserver
 RUN /domjudge-src/build.sh
 
@@ -103,6 +98,11 @@ ENV PATH="$PATH:/opt/domjudge/domserver/bin"
 COPY domserver/configure.sh /configure.sh
 RUN chmod 700 /configure.sh && /configure.sh && rm -f /configure.sh
 
+# Apply patches
+COPY domserver/scripts/patches.sh /scripts/patches.sh
+COPY domserver/scripts/patches.d /scripts/patches.d
+RUN chmod 700 /scripts/patches.sh && /scripts/patches.sh
+
 # Expose HTTP port
 EXPOSE 80
 

diff --git a/domjudge-packaging/docker/examples/remote_user_scripts/20-add-firewall-remote-user.py b/domjudge-packaging/docker/examples/remote_user_scripts/20-add-firewall-remote-user.py
diff --git a/domjudge-packaging/docker/examples/remote_user_scripts/90-add-nginx-remote-user.sh b/domjudge-packaging/docker/examples/remote_user_scripts/90-add-nginx-remote-user.sh