From 50cc2334dd71b80c8c3319478fed4a9690467f15 Mon Sep 17 00:00:00 2001 From: SG Date: Tue, 9 Jan 2024 11:17:20 -0700 Subject: [PATCH] consistenly populate MALCOLM_VERSION, BUILD_DATE, VCS_REVISION in docker images --- Dockerfiles/api.Dockerfile | 1 - Dockerfiles/arkime.Dockerfile | 3 +++ Dockerfiles/dashboards-helper.Dockerfile | 3 +++ Dockerfiles/dashboards.Dockerfile | 3 +++ Dockerfiles/dirinit.Dockerfile | 3 +++ Dockerfiles/file-monitor.Dockerfile | 3 +++ Dockerfiles/file-upload.Dockerfile | 3 +++ Dockerfiles/filebeat.Dockerfile | 3 +++ Dockerfiles/freq.Dockerfile | 3 +++ Dockerfiles/htadmin.Dockerfile | 3 +++ Dockerfiles/logstash.Dockerfile | 3 +++ Dockerfiles/netbox.Dockerfile | 1 - Dockerfiles/nginx.Dockerfile | 3 +++ Dockerfiles/opensearch.Dockerfile | 3 +++ Dockerfiles/pcap-capture.Dockerfile | 3 +++ Dockerfiles/pcap-monitor.Dockerfile | 3 +++ Dockerfiles/postgresql.Dockerfile | 1 - Dockerfiles/redis.Dockerfile | 1 - Dockerfiles/suricata.Dockerfile | 13 +++++++++++++ Dockerfiles/zeek.Dockerfile | 3 +++ scripts/build.sh | 2 +- 21 files changed, 59 insertions(+), 5 deletions(-) diff --git a/Dockerfiles/api.Dockerfile b/Dockerfiles/api.Dockerfile index e4666a15a..dc80e696a 100644 --- a/Dockerfiles/api.Dockerfile +++ b/Dockerfiles/api.Dockerfile @@ -106,7 +106,6 @@ ENTRYPOINT ["/usr/bin/tini", \ 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 index e1fbcc82e..1ae22ebba 100644 --- a/Dockerfiles/arkime.Dockerfile +++ b/Dockerfiles/arkime.Dockerfile @@ -277,6 +277,9 @@ CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf", "-n"] ARG BUILD_DATE ARG MALCOLM_VERSION ARG VCS_REVISION +ENV BUILD_DATE $BUILD_DATE +ENV MALCOLM_VERSION $MALCOLM_VERSION +ENV VCS_REVISION $VCS_REVISION LABEL org.opencontainers.image.created=$BUILD_DATE LABEL org.opencontainers.image.version=$MALCOLM_VERSION diff --git a/Dockerfiles/dashboards-helper.Dockerfile b/Dockerfiles/dashboards-helper.Dockerfile index 217c139fe..e8e009089 100644 --- a/Dockerfiles/dashboards-helper.Dockerfile +++ b/Dockerfiles/dashboards-helper.Dockerfile @@ -117,6 +117,9 @@ VOLUME ["/data/init"] ARG BUILD_DATE ARG MALCOLM_VERSION ARG VCS_REVISION +ENV BUILD_DATE $BUILD_DATE +ENV MALCOLM_VERSION $MALCOLM_VERSION +ENV VCS_REVISION $VCS_REVISION LABEL org.opencontainers.image.created=$BUILD_DATE LABEL org.opencontainers.image.version=$MALCOLM_VERSION diff --git a/Dockerfiles/dashboards.Dockerfile b/Dockerfiles/dashboards.Dockerfile index 1ccbca95a..37991229f 100644 --- a/Dockerfiles/dashboards.Dockerfile +++ b/Dockerfiles/dashboards.Dockerfile @@ -118,6 +118,9 @@ EXPOSE 5601 ARG BUILD_DATE ARG MALCOLM_VERSION ARG VCS_REVISION +ENV BUILD_DATE $BUILD_DATE +ENV MALCOLM_VERSION $MALCOLM_VERSION +ENV VCS_REVISION $VCS_REVISION LABEL org.opencontainers.image.created=$BUILD_DATE LABEL org.opencontainers.image.version=$MALCOLM_VERSION diff --git a/Dockerfiles/dirinit.Dockerfile b/Dockerfiles/dirinit.Dockerfile index e13689ee5..b469571aa 100644 --- a/Dockerfiles/dirinit.Dockerfile +++ b/Dockerfiles/dirinit.Dockerfile @@ -42,6 +42,9 @@ ARG BUILD_DATE ARG MALCOLM_VERSION ARG VCS_REVISION +ENV BUILD_DATE $BUILD_DATE +ENV MALCOLM_VERSION $MALCOLM_VERSION +ENV VCS_REVISION $VCS_REVISION ENV BUILD_DATE $BUILD_DATE ENV MALCOLM_VERSION $MALCOLM_VERSION ENV VCS_REVISION $VCS_REVISION diff --git a/Dockerfiles/file-monitor.Dockerfile b/Dockerfiles/file-monitor.Dockerfile index aae54c3b3..20e831c7a 100644 --- a/Dockerfiles/file-monitor.Dockerfile +++ b/Dockerfiles/file-monitor.Dockerfile @@ -256,6 +256,9 @@ CMD ["/usr/local/bin/supervisord", "-c", "/etc/supervisord.conf", "-n"] ARG BUILD_DATE ARG MALCOLM_VERSION ARG VCS_REVISION +ENV BUILD_DATE $BUILD_DATE +ENV MALCOLM_VERSION $MALCOLM_VERSION +ENV VCS_REVISION $VCS_REVISION LABEL org.opencontainers.image.created=$BUILD_DATE LABEL org.opencontainers.image.version=$MALCOLM_VERSION diff --git a/Dockerfiles/file-upload.Dockerfile b/Dockerfiles/file-upload.Dockerfile index fd582306a..1d6c2cab2 100644 --- a/Dockerfiles/file-upload.Dockerfile +++ b/Dockerfiles/file-upload.Dockerfile @@ -140,6 +140,9 @@ CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf", "-u", "root", "-n"] ARG BUILD_DATE ARG MALCOLM_VERSION ARG VCS_REVISION +ENV BUILD_DATE $BUILD_DATE +ENV MALCOLM_VERSION $MALCOLM_VERSION +ENV VCS_REVISION $VCS_REVISION LABEL org.opencontainers.image.created=$BUILD_DATE LABEL org.opencontainers.image.version=$MALCOLM_VERSION diff --git a/Dockerfiles/filebeat.Dockerfile b/Dockerfiles/filebeat.Dockerfile index f3ee8e66c..659236bfc 100644 --- a/Dockerfiles/filebeat.Dockerfile +++ b/Dockerfiles/filebeat.Dockerfile @@ -181,6 +181,9 @@ CMD ["/usr/local/bin/supervisord", "-c", "/etc/supervisord.conf", "-u", "root", ARG BUILD_DATE ARG MALCOLM_VERSION ARG VCS_REVISION +ENV BUILD_DATE $BUILD_DATE +ENV MALCOLM_VERSION $MALCOLM_VERSION +ENV VCS_REVISION $VCS_REVISION LABEL org.opencontainers.image.created=$BUILD_DATE LABEL org.opencontainers.image.version=$MALCOLM_VERSION diff --git a/Dockerfiles/freq.Dockerfile b/Dockerfiles/freq.Dockerfile index 82f9067b4..3801f963c 100644 --- a/Dockerfiles/freq.Dockerfile +++ b/Dockerfiles/freq.Dockerfile @@ -77,6 +77,9 @@ CMD ["/usr/local/bin/supervisord", "-c", "/etc/supervisord.conf", "-n"] ARG BUILD_DATE ARG MALCOLM_VERSION ARG VCS_REVISION +ENV BUILD_DATE $BUILD_DATE +ENV MALCOLM_VERSION $MALCOLM_VERSION +ENV VCS_REVISION $VCS_REVISION LABEL org.opencontainers.image.created=$BUILD_DATE LABEL org.opencontainers.image.version=$MALCOLM_VERSION diff --git a/Dockerfiles/htadmin.Dockerfile b/Dockerfiles/htadmin.Dockerfile index ffcc27bd9..82718df06 100644 --- a/Dockerfiles/htadmin.Dockerfile +++ b/Dockerfiles/htadmin.Dockerfile @@ -104,6 +104,9 @@ CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf", "-u", "root", "-n"] ARG BUILD_DATE ARG MALCOLM_VERSION ARG VCS_REVISION +ENV BUILD_DATE $BUILD_DATE +ENV MALCOLM_VERSION $MALCOLM_VERSION +ENV VCS_REVISION $VCS_REVISION LABEL org.opencontainers.image.created=$BUILD_DATE LABEL org.opencontainers.image.version=$MALCOLM_VERSION diff --git a/Dockerfiles/logstash.Dockerfile b/Dockerfiles/logstash.Dockerfile index e5e792f2e..85c7104fc 100644 --- a/Dockerfiles/logstash.Dockerfile +++ b/Dockerfiles/logstash.Dockerfile @@ -143,6 +143,9 @@ CMD ["/usr/local/bin/supervisord", "-c", "/etc/supervisord.conf", "-n"] ARG BUILD_DATE ARG MALCOLM_VERSION ARG VCS_REVISION +ENV BUILD_DATE $BUILD_DATE +ENV MALCOLM_VERSION $MALCOLM_VERSION +ENV VCS_REVISION $VCS_REVISION LABEL org.opencontainers.image.created=$BUILD_DATE LABEL org.opencontainers.image.version=$MALCOLM_VERSION diff --git a/Dockerfiles/netbox.Dockerfile b/Dockerfiles/netbox.Dockerfile index fce34a491..c513fe26a 100644 --- a/Dockerfiles/netbox.Dockerfile +++ b/Dockerfiles/netbox.Dockerfile @@ -138,7 +138,6 @@ CMD ["/opt/netbox/docker-entrypoint.sh", "/usr/bin/supervisord", "-c", "/etc/sup 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 index d86c8cbf8..425e3fcbb 100644 --- a/Dockerfiles/nginx.Dockerfile +++ b/Dockerfiles/nginx.Dockerfile @@ -264,6 +264,9 @@ CMD ["supervisord", "-c", "/etc/supervisord.conf", "-u", "root", "-n"] ARG BUILD_DATE ARG MALCOLM_VERSION ARG VCS_REVISION +ENV BUILD_DATE $BUILD_DATE +ENV MALCOLM_VERSION $MALCOLM_VERSION +ENV VCS_REVISION $VCS_REVISION LABEL org.opencontainers.image.created=$BUILD_DATE LABEL org.opencontainers.image.version=$MALCOLM_VERSION diff --git a/Dockerfiles/opensearch.Dockerfile b/Dockerfiles/opensearch.Dockerfile index bdfccaf61..82fbddd10 100644 --- a/Dockerfiles/opensearch.Dockerfile +++ b/Dockerfiles/opensearch.Dockerfile @@ -92,6 +92,9 @@ CMD ["/usr/share/opensearch/opensearch-docker-entrypoint.sh"] ARG BUILD_DATE ARG MALCOLM_VERSION ARG VCS_REVISION +ENV BUILD_DATE $BUILD_DATE +ENV MALCOLM_VERSION $MALCOLM_VERSION +ENV VCS_REVISION $VCS_REVISION LABEL org.opencontainers.image.created=$BUILD_DATE LABEL org.opencontainers.image.version=$MALCOLM_VERSION diff --git a/Dockerfiles/pcap-capture.Dockerfile b/Dockerfiles/pcap-capture.Dockerfile index c582e9e26..15cc1b528 100644 --- a/Dockerfiles/pcap-capture.Dockerfile +++ b/Dockerfiles/pcap-capture.Dockerfile @@ -105,6 +105,9 @@ CMD ["/usr/local/bin/supervisor.sh"] ARG BUILD_DATE ARG MALCOLM_VERSION ARG VCS_REVISION +ENV BUILD_DATE $BUILD_DATE +ENV MALCOLM_VERSION $MALCOLM_VERSION +ENV VCS_REVISION $VCS_REVISION LABEL org.opencontainers.image.created=$BUILD_DATE LABEL org.opencontainers.image.version=$MALCOLM_VERSION diff --git a/Dockerfiles/pcap-monitor.Dockerfile b/Dockerfiles/pcap-monitor.Dockerfile index b1baabbee..84a9a0b0f 100644 --- a/Dockerfiles/pcap-monitor.Dockerfile +++ b/Dockerfiles/pcap-monitor.Dockerfile @@ -99,6 +99,9 @@ CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf", "-u", "root", "-n"] ARG BUILD_DATE ARG MALCOLM_VERSION ARG VCS_REVISION +ENV BUILD_DATE $BUILD_DATE +ENV MALCOLM_VERSION $MALCOLM_VERSION +ENV VCS_REVISION $VCS_REVISION LABEL org.opencontainers.image.created=$BUILD_DATE LABEL org.opencontainers.image.version=$MALCOLM_VERSION diff --git a/Dockerfiles/postgresql.Dockerfile b/Dockerfiles/postgresql.Dockerfile index dde2e3b4d..4f263abbb 100644 --- a/Dockerfiles/postgresql.Dockerfile +++ b/Dockerfiles/postgresql.Dockerfile @@ -52,7 +52,6 @@ CMD ["/usr/bin/docker-entrypoint.sh", "postgres"] 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 index a7ce82e61..0e28fdf3d 100644 --- a/Dockerfiles/redis.Dockerfile +++ b/Dockerfiles/redis.Dockerfile @@ -41,7 +41,6 @@ ENTRYPOINT ["/sbin/tini", \ 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 index 62f026d4b..e75aa2d30 100644 --- a/Dockerfiles/suricata.Dockerfile +++ b/Dockerfiles/suricata.Dockerfile @@ -199,3 +199,16 @@ ENTRYPOINT ["/usr/bin/tini", \ "/usr/local/bin/docker_entrypoint.sh"] 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 +ENV MALCOLM_VERSION $MALCOLM_VERSION +ENV VCS_REVISION $VCS_REVISION + +LABEL org.opencontainers.image.created=$BUILD_DATE +LABEL org.opencontainers.image.version=$MALCOLM_VERSION +LABEL org.opencontainers.image.revision=$VCS_REVISION diff --git a/Dockerfiles/zeek.Dockerfile b/Dockerfiles/zeek.Dockerfile index b71ae6801..a036649ab 100644 --- a/Dockerfiles/zeek.Dockerfile +++ b/Dockerfiles/zeek.Dockerfile @@ -358,6 +358,9 @@ CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf", "-n"] ARG BUILD_DATE ARG MALCOLM_VERSION ARG VCS_REVISION +ENV BUILD_DATE $BUILD_DATE +ENV MALCOLM_VERSION $MALCOLM_VERSION +ENV VCS_REVISION $VCS_REVISION LABEL org.opencontainers.image.created=$BUILD_DATE LABEL org.opencontainers.image.version=$MALCOLM_VERSION diff --git a/scripts/build.sh b/scripts/build.sh index ec85eeb1c..c5330f14b 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -77,7 +77,7 @@ read -p "Malcolm Docker images will now be built and/or pulled, force full clean CONFIRMATION=${CONFIRMATION:-N} BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" -MALCOLM_VERSION="$($GREP -P "^\s+image:\s*malcolm" "$CONFIG_FILE" | awk '{print $2}' | cut -d':' -f2 | uniq -c | sort -nr | awk '{print $2}' | head -n 1)" +MALCOLM_VERSION="$($GREP -P "^\s+image:\s*.*/malcolm/" "$CONFIG_FILE" | awk '{print $2}' | cut -d':' -f2 | uniq -c | sort -nr | awk '{print $2}' | head -n 1)" VCS_REVISION="$(git rev-parse --short HEAD 2>/dev/null || echo unknown)" GITHUB_API_TOKEN="${GITHUB_TOKEN:-}"