fix some issues with the dockerfile syntax

mmguero · mmguero · commit 772a7c2a522d · 2026-01-19T22:40:11.000Z
diff --git a/Dockerfiles/api.Dockerfile b/Dockerfiles/api.Dockerfile
@@ -90,7 +90,10 @@ ENTRYPOINT ["/usr/bin/tini", \
             "/malcolm/api/entrypoint.sh"]
 
 # to be populated at build-time:
-ARG BUILD_DATE=ARG MALCOLM_VERSION=ARG VCS_REVISION=ENV BUILD_DATE=$BUILD_DATE
+ARG BUILD_DATE
+ARG MALCOLM_VERSION
+ARG VCS_REVISION
+ENV BUILD_DATE=$BUILD_DATE
 ENV MALCOLM_VERSION=$MALCOLM_VERSION
 ENV VCS_REVISION=$VCS_REVISION
 
diff --git a/Dockerfiles/arkime.Dockerfile b/Dockerfiles/arkime.Dockerfile
@@ -220,7 +220,10 @@ CMD ["/usr/local/bin/supervisord", "-c", "/etc/supervisord.conf", "-n"]
 
 
 # to be populated at build-time:
-ARG BUILD_DATE=ARG MALCOLM_VERSION=ARG VCS_REVISION=ENV BUILD_DATE=$BUILD_DATE
+ARG BUILD_DATE
+ARG MALCOLM_VERSION
+ARG VCS_REVISION
+ENV BUILD_DATE=$BUILD_DATE
 ENV MALCOLM_VERSION=$MALCOLM_VERSION
 ENV VCS_REVISION=$VCS_REVISION
 
diff --git a/Dockerfiles/dashboards-helper.Dockerfile b/Dockerfiles/dashboards-helper.Dockerfile
@@ -137,7 +137,10 @@ CMD ["/usr/local/bin/supervisord", "-c", "/etc/supervisord.conf", "-n"]
 VOLUME ["/data/init"]
 
 # to be populated at build-time:
-ARG BUILD_DATE=ARG MALCOLM_VERSION=ARG VCS_REVISION=ENV BUILD_DATE=$BUILD_DATE
+ARG BUILD_DATE
+ARG MALCOLM_VERSION
+ARG VCS_REVISION
+ENV BUILD_DATE=$BUILD_DATE
 ENV MALCOLM_VERSION=$MALCOLM_VERSION
 ENV VCS_REVISION=$VCS_REVISION
 
diff --git a/Dockerfiles/dashboards.Dockerfile b/Dockerfiles/dashboards.Dockerfile
@@ -63,7 +63,10 @@ CMD ["/usr/share/opensearch-dashboards/opensearch-dashboards-docker-entrypoint.s
 EXPOSE 5601
 
 # to be populated at build-time:
-ARG BUILD_DATE=ARG MALCOLM_VERSION=ARG VCS_REVISION=ENV BUILD_DATE=$BUILD_DATE
+ARG BUILD_DATE
+ARG MALCOLM_VERSION
+ARG VCS_REVISION
+ENV BUILD_DATE=$BUILD_DATE
 ENV MALCOLM_VERSION=$MALCOLM_VERSION
 ENV VCS_REVISION=$VCS_REVISION
 
diff --git a/Dockerfiles/dirinit.Dockerfile b/Dockerfiles/dirinit.Dockerfile
@@ -39,9 +39,9 @@ ENTRYPOINT ["/sbin/tini", \
             "true"]
 
 # to be populated at build-time:
-ARG BUILD_DATE=ARG MALCOLM_VERSION=ARG VCS_REVISION=ENV BUILD_DATE=$BUILD_DATE
-ENV MALCOLM_VERSION=$MALCOLM_VERSION
-ENV VCS_REVISION=$VCS_REVISION
+ARG BUILD_DATE
+ARG MALCOLM_VERSION
+ARG VCS_REVISION
 ENV BUILD_DATE=$BUILD_DATE
 ENV MALCOLM_VERSION=$MALCOLM_VERSION
 ENV VCS_REVISION=$VCS_REVISION
diff --git a/Dockerfiles/file-upload.Dockerfile b/Dockerfiles/file-upload.Dockerfile
@@ -151,7 +151,10 @@ ENTRYPOINT ["/usr/bin/tini", \
 CMD ["/usr/local/bin/supervisord", "-c", "/supervisord.conf", "-u", "root", "-n"]
 
 # to be populated at build-time:
-ARG BUILD_DATE=ARG MALCOLM_VERSION=ARG VCS_REVISION=ENV BUILD_DATE=$BUILD_DATE
+ARG BUILD_DATE
+ARG MALCOLM_VERSION
+ARG VCS_REVISION
+ENV BUILD_DATE=$BUILD_DATE
 ENV MALCOLM_VERSION=$MALCOLM_VERSION
 ENV VCS_REVISION=$VCS_REVISION
 
diff --git a/Dockerfiles/filebeat.Dockerfile b/Dockerfiles/filebeat.Dockerfile
@@ -207,7 +207,10 @@ CMD ["/usr/local/bin/supervisord", "-c", "/etc/supervisord.conf", "-u", "root",
 
 
 # to be populated at build-time:
-ARG BUILD_DATE=ARG MALCOLM_VERSION=ARG VCS_REVISION=ENV BUILD_DATE=$BUILD_DATE
+ARG BUILD_DATE
+ARG MALCOLM_VERSION
+ARG VCS_REVISION
+ENV BUILD_DATE=$BUILD_DATE
 ENV MALCOLM_VERSION=$MALCOLM_VERSION
 ENV VCS_REVISION=$VCS_REVISION
 
diff --git a/Dockerfiles/filescan.Dockerfile b/Dockerfiles/filescan.Dockerfile
@@ -177,7 +177,10 @@ ENTRYPOINT ["/usr/bin/tini", \
 CMD ["/usr/local/bin/supervisord", "-c", "/etc/supervisord.conf", "-n"]
 
 # to be populated at build-time:
-ARG BUILD_DATE=ARG MALCOLM_VERSION=ARG VCS_REVISION=ENV BUILD_DATE=$BUILD_DATE
+ARG BUILD_DATE
+ARG MALCOLM_VERSION
+ARG VCS_REVISION
+ENV BUILD_DATE=$BUILD_DATE
 ENV MALCOLM_VERSION=$MALCOLM_VERSION
 ENV VCS_REVISION=$VCS_REVISION
 
diff --git a/Dockerfiles/freq.Dockerfile b/Dockerfiles/freq.Dockerfile
@@ -82,7 +82,10 @@ CMD ["/usr/local/bin/supervisord", "-c", "/etc/supervisord.conf", "-n"]
 
 
 # to be populated at build-time:
-ARG BUILD_DATE=ARG MALCOLM_VERSION=ARG VCS_REVISION=ENV BUILD_DATE=$BUILD_DATE
+ARG BUILD_DATE
+ARG MALCOLM_VERSION
+ARG VCS_REVISION
+ENV BUILD_DATE=$BUILD_DATE
 ENV MALCOLM_VERSION=$MALCOLM_VERSION
 ENV VCS_REVISION=$VCS_REVISION
 
diff --git a/Dockerfiles/htadmin.Dockerfile b/Dockerfiles/htadmin.Dockerfile
@@ -106,7 +106,10 @@ CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf", "-u", "root", "-n"]
 
 
 # to be populated at build-time:
-ARG BUILD_DATE=ARG MALCOLM_VERSION=ARG VCS_REVISION=ENV BUILD_DATE=$BUILD_DATE
+ARG BUILD_DATE
+ARG MALCOLM_VERSION
+ARG VCS_REVISION
+ENV BUILD_DATE=$BUILD_DATE
 ENV MALCOLM_VERSION=$MALCOLM_VERSION
 ENV VCS_REVISION=$VCS_REVISION
 
diff --git a/Dockerfiles/keycloak.Dockerfile b/Dockerfiles/keycloak.Dockerfile
@@ -87,7 +87,10 @@ ENTRYPOINT ["/usr/bin/tini", \
 CMD ["/opt/keycloak/bin/kc.sh"]
 
 # to be populated at build-time:
-ARG BUILD_DATE=ARG MALCOLM_VERSION=ARG VCS_REVISION=ENV BUILD_DATE=$BUILD_DATE
+ARG BUILD_DATE
+ARG MALCOLM_VERSION
+ARG VCS_REVISION
+ENV BUILD_DATE=$BUILD_DATE
 ENV MALCOLM_VERSION=$MALCOLM_VERSION
 ENV VCS_REVISION=$VCS_REVISION
 
diff --git a/Dockerfiles/netbox.Dockerfile b/Dockerfiles/netbox.Dockerfile
@@ -136,7 +136,10 @@ ENTRYPOINT ["/usr/bin/tini", \
 CMD ["/opt/netbox/docker-entrypoint.sh", "supervisord", "-c", "/etc/supervisord.conf", "-n"]
 
 # to be populated at build-time:
-ARG BUILD_DATE=ARG MALCOLM_VERSION=ARG VCS_REVISION=ENV BUILD_DATE=$BUILD_DATE
+ARG BUILD_DATE
+ARG MALCOLM_VERSION
+ARG VCS_REVISION
+ENV BUILD_DATE=$BUILD_DATE
 ENV MALCOLM_VERSION=$MALCOLM_VERSION
 ENV VCS_REVISION=$VCS_REVISION
 
diff --git a/Dockerfiles/nginx.Dockerfile b/Dockerfiles/nginx.Dockerfile
@@ -307,7 +307,10 @@ CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf", "-u", "root", "-n"]
 
 
 # to be populated at build-time:
-ARG BUILD_DATE=ARG MALCOLM_VERSION=ARG VCS_REVISION=ENV BUILD_DATE=$BUILD_DATE
+ARG BUILD_DATE
+ARG MALCOLM_VERSION
+ARG VCS_REVISION
+ENV BUILD_DATE=$BUILD_DATE
 ENV MALCOLM_VERSION=$MALCOLM_VERSION
 ENV VCS_REVISION=$VCS_REVISION
 
diff --git a/Dockerfiles/opensearch.Dockerfile b/Dockerfiles/opensearch.Dockerfile
@@ -104,7 +104,10 @@ ENTRYPOINT ["/usr/bin/tini", \
 CMD [ "/usr/share/opensearch/opensearch-docker-entrypoint.sh" ]
 
 # to be populated at build-time:
-ARG BUILD_DATE=ARG MALCOLM_VERSION=ARG VCS_REVISION=ENV BUILD_DATE=$BUILD_DATE
+ARG BUILD_DATE
+ARG MALCOLM_VERSION
+ARG VCS_REVISION
+ENV BUILD_DATE=$BUILD_DATE
 ENV MALCOLM_VERSION=$MALCOLM_VERSION
 ENV VCS_REVISION=$VCS_REVISION
 
diff --git a/Dockerfiles/pcap-capture.Dockerfile b/Dockerfiles/pcap-capture.Dockerfile
@@ -113,7 +113,10 @@ CMD ["/usr/local/bin/supervisor.sh"]
 
 
 # to be populated at build-time:
-ARG BUILD_DATE=ARG MALCOLM_VERSION=ARG VCS_REVISION=ENV BUILD_DATE=$BUILD_DATE
+ARG BUILD_DATE
+ARG MALCOLM_VERSION
+ARG VCS_REVISION
+ENV BUILD_DATE=$BUILD_DATE
 ENV MALCOLM_VERSION=$MALCOLM_VERSION
 ENV VCS_REVISION=$VCS_REVISION
 
diff --git a/Dockerfiles/pcap-monitor.Dockerfile b/Dockerfiles/pcap-monitor.Dockerfile
@@ -103,7 +103,10 @@ CMD ["/usr/local/bin/supervisord", "-c", "/etc/supervisord.conf", "-u", "root",
 
 
 # to be populated at build-time:
-ARG BUILD_DATE=ARG MALCOLM_VERSION=ARG VCS_REVISION=ENV BUILD_DATE=$BUILD_DATE
+ARG BUILD_DATE
+ARG MALCOLM_VERSION
+ARG VCS_REVISION
+ENV BUILD_DATE=$BUILD_DATE
 ENV MALCOLM_VERSION=$MALCOLM_VERSION
 ENV VCS_REVISION=$VCS_REVISION
 
diff --git a/Dockerfiles/postgresql.Dockerfile b/Dockerfiles/postgresql.Dockerfile
@@ -56,7 +56,10 @@ ENTRYPOINT ["/sbin/tini", \
 CMD ["/usr/bin/docker-entrypoint.sh", "postgres"]
 
 # to be populated at build-time:
-ARG BUILD_DATE=ARG MALCOLM_VERSION=ARG VCS_REVISION=ENV BUILD_DATE=$BUILD_DATE
+ARG BUILD_DATE
+ARG MALCOLM_VERSION
+ARG VCS_REVISION
+ENV BUILD_DATE=$BUILD_DATE
 ENV MALCOLM_VERSION=$MALCOLM_VERSION
 ENV VCS_REVISION=$VCS_REVISION
 
diff --git a/Dockerfiles/redis.Dockerfile b/Dockerfiles/redis.Dockerfile
@@ -42,7 +42,10 @@ ENTRYPOINT ["/sbin/tini", \
             "-s", "redis"]
 
 # to be populated at build-time:
-ARG BUILD_DATE=ARG MALCOLM_VERSION=ARG VCS_REVISION=ENV BUILD_DATE=$BUILD_DATE
+ARG BUILD_DATE
+ARG MALCOLM_VERSION
+ARG VCS_REVISION
+ENV BUILD_DATE=$BUILD_DATE
 ENV MALCOLM_VERSION=$MALCOLM_VERSION
 ENV VCS_REVISION=$VCS_REVISION
 
diff --git a/Dockerfiles/strelka-backend.Dockerfile b/Dockerfiles/strelka-backend.Dockerfile
@@ -125,7 +125,10 @@ ENTRYPOINT ["/usr/bin/tini", \
 CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf", "-n"]
 
 # to be populated at build-time:
-ARG BUILD_DATE=ARG MALCOLM_VERSION=ARG VCS_REVISION=ENV BUILD_DATE=$BUILD_DATE
+ARG BUILD_DATE
+ARG MALCOLM_VERSION
+ARG VCS_REVISION
+ENV BUILD_DATE=$BUILD_DATE
 ENV MALCOLM_VERSION=$MALCOLM_VERSION
 ENV VCS_REVISION=$VCS_REVISION
 
diff --git a/Dockerfiles/strelka-frontend.Dockerfile b/Dockerfiles/strelka-frontend.Dockerfile
@@ -55,9 +55,9 @@ ENTRYPOINT ["/sbin/tini", \
 CMD ["strelka-frontend", "-locallog=true", "-kafkalog=false" ]
 
 # to be populated at build-time:
-ARG BUILD_DATE=ARG MALCOLM_VERSION=ARG VCS_REVISION=ENV BUILD_DATE=$BUILD_DATE
-ENV MALCOLM_VERSION=$MALCOLM_VERSION
-ENV VCS_REVISION=$VCS_REVISION
+ARG BUILD_DATE
+ARG MALCOLM_VERSION
+ARG VCS_REVISION
 ENV BUILD_DATE=$BUILD_DATE
 ENV MALCOLM_VERSION=$MALCOLM_VERSION
 ENV VCS_REVISION=$VCS_REVISION
diff --git a/Dockerfiles/strelka-manager.Dockerfile b/Dockerfiles/strelka-manager.Dockerfile
@@ -49,9 +49,9 @@ ENTRYPOINT ["/sbin/tini", \
 CMD ["strelka-manager"]
 
 # to be populated at build-time:
-ARG BUILD_DATE=ARG MALCOLM_VERSION=ARG VCS_REVISION=ENV BUILD_DATE=$BUILD_DATE
-ENV MALCOLM_VERSION=$MALCOLM_VERSION
-ENV VCS_REVISION=$VCS_REVISION
+ARG BUILD_DATE
+ARG MALCOLM_VERSION
+ARG VCS_REVISION
 ENV BUILD_DATE=$BUILD_DATE
 ENV MALCOLM_VERSION=$MALCOLM_VERSION
 ENV VCS_REVISION=$VCS_REVISION
diff --git a/Dockerfiles/suricata.Dockerfile b/Dockerfiles/suricata.Dockerfile
@@ -218,7 +218,10 @@ ENTRYPOINT ["/usr/bin/tini", \
 CMD ["/usr/local/bin/supervisord", "-c", "/etc/supervisord.conf", "-n"]
 
 # to be populated at build-time:
-ARG BUILD_DATE=ARG MALCOLM_VERSION=ARG VCS_REVISION=ENV BUILD_DATE=$BUILD_DATE
+ARG BUILD_DATE
+ARG MALCOLM_VERSION
+ARG VCS_REVISION
+ENV BUILD_DATE=$BUILD_DATE
 ENV MALCOLM_VERSION=$MALCOLM_VERSION
 ENV VCS_REVISION=$VCS_REVISION
 
diff --git a/Dockerfiles/zeek.Dockerfile b/Dockerfiles/zeek.Dockerfile
@@ -346,7 +346,10 @@ CMD ["/usr/local/bin/supervisord", "-c", "/etc/supervisord.conf", "-n"]
 USER root
 
 # to be populated at build-time:
-ARG BUILD_DATE=ARG MALCOLM_VERSION=ARG VCS_REVISION=ENV BUILD_DATE=$BUILD_DATE
+ARG BUILD_DATE
+ARG MALCOLM_VERSION
+ARG VCS_REVISION
+ENV BUILD_DATE=$BUILD_DATE
 ENV MALCOLM_VERSION=$MALCOLM_VERSION
 ENV VCS_REVISION=$VCS_REVISION
 
