Fix crontab ownership and rename folder (#148)

jeremylong · Mar 18, 2024 · 5988546 · 5988546
1 parent c0c0367
commit 5988546
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/vulnz/Dockerfile b/vulnz/Dockerfile
@@ -35,15 +35,15 @@ RUN apk update && \
     mkdir -p /var/log/supervisor && \
     rm -v /usr/local/apache2/htdocs/index.html
 
-COPY ["/src/docker/conf/supervisord.conf", "/etc/supervisord.conf"]
+COPY ["/src/docker/supervisor/supervisord.conf", "/etc/supervisord.conf"]
 COPY ["/src/docker/scripts/mirror.sh", "/mirror.sh"]
 COPY ["/src/docker/crontab/mirror", "/etc/crontabs/mirror"]
-COPY ["/src/docker/conf/mirror.conf", "/usr/local/apache2/conf"]
+COPY ["/src/docker/apache/mirror.conf", "/usr/local/apache2/conf"]
 COPY ["/build/libs/vulnz-$BUILD_VERSION.jar", "/usr/local/bin/vulnz"]
 
 RUN chmod +x /mirror.sh && \
+    chown root:root /etc/crontabs/mirror && \
     chown mirror:mirror /mirror.sh && \
-    chown mirror:mirror /etc/crontabs/mirror && \
     chown mirror:mirror /usr/local/bin/vulnz 
 
 # ensures our cron task is logged into stdout of docker

diff --git a/vulnz/src/docker/conf/mirror.conf → vulnz/src/docker/apache/mirror.conf b/vulnz/src/docker/conf/mirror.conf → vulnz/src/docker/apache/mirror.conf
diff --git a/vulnz/src/docker/conf/supervisord.conf → vulnz/src/docker/supervisor/supervisord.conf b/vulnz/src/docker/conf/supervisord.conf → vulnz/src/docker/supervisor/supervisord.conf