Explicitly define target platform for building images (idaholab#389)

mmguero-dev · May 7, 2024 · 6b359c7 · 6b359c7
1 parent ca58ed2
commit 6b359c7
Show file tree

Hide file tree

Showing 41 changed files with 108 additions and 47 deletions.
diff --git a/.github/workflows/api-build-and-push-ghcr.yml b/.github/workflows/api-build-and-push-ghcr.yml
@@ -37,7 +37,7 @@ jobs:
       matrix:
         platform:
           - linux/amd64
-          # - linux/arm64
+          - linux/arm64
     steps:
       -
         name: Cancel previous run in progress
@@ -95,6 +95,7 @@ jobs:
           context: .
           file: ./Dockerfiles/api.Dockerfile
           build-args: |
+            TARGETPLATFORM=${{ matrix.platform }}
             MALCOLM_VERSION=${{ steps.extract_malcolm_version.outputs.mversion }}
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}

diff --git a/.github/workflows/arkime-build-and-push-ghcr.yml b/.github/workflows/arkime-build-and-push-ghcr.yml
@@ -37,7 +37,7 @@ jobs:
       matrix:
         platform:
           - linux/amd64
-          # - linux/arm64
+          - linux/arm64
     steps:
       -
         name: Cancel previous run in progress
@@ -95,6 +95,7 @@ jobs:
           context: .
           file: ./Dockerfiles/arkime.Dockerfile
           build-args: |
+            TARGETPLATFORM=${{ matrix.platform }}
             MALCOLM_VERSION=${{ steps.extract_malcolm_version.outputs.mversion }}
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}

diff --git a/.github/workflows/dashboards-build-and-push-ghcr.yml b/.github/workflows/dashboards-build-and-push-ghcr.yml
@@ -37,7 +37,7 @@ jobs:
       matrix:
         platform:
           - linux/amd64
-          # - linux/arm64
+          - linux/arm64
     steps:
       -
         name: Cancel previous run in progress
@@ -95,6 +95,7 @@ jobs:
           context: .
           file: ./Dockerfiles/dashboards.Dockerfile
           build-args: |
+            TARGETPLATFORM=${{ matrix.platform }}
             MALCOLM_VERSION=${{ steps.extract_malcolm_version.outputs.mversion }}
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}

diff --git a/.github/workflows/dashboards-helper-build-and-push-ghcr.yml b/.github/workflows/dashboards-helper-build-and-push-ghcr.yml
@@ -37,7 +37,7 @@ jobs:
       matrix:
         platform:
           - linux/amd64
-          # - linux/arm64
+          - linux/arm64
     steps:
       -
         name: Cancel previous run in progress
@@ -95,6 +95,7 @@ jobs:
           context: .
           file: ./Dockerfiles/dashboards-helper.Dockerfile
           build-args: |
+            TARGETPLATFORM=${{ matrix.platform }}
             MALCOLM_VERSION=${{ steps.extract_malcolm_version.outputs.mversion }}
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}

diff --git a/.github/workflows/dirinit-build-and-push-ghcr.yml b/.github/workflows/dirinit-build-and-push-ghcr.yml
@@ -25,7 +25,7 @@ jobs:
       matrix:
         platform:
           - linux/amd64
-          # - linux/arm64
+          - linux/arm64
     steps:
       -
         name: Cancel previous run in progress
@@ -83,6 +83,7 @@ jobs:
           context: .
           file: ./Dockerfiles/dirinit.Dockerfile
           build-args: |
+            TARGETPLATFORM=${{ matrix.platform }}
             MALCOLM_VERSION=${{ steps.extract_malcolm_version.outputs.mversion }}
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}

diff --git a/.github/workflows/file-monitor-build-and-push-ghcr.yml b/.github/workflows/file-monitor-build-and-push-ghcr.yml
@@ -35,7 +35,7 @@ jobs:
       matrix:
         platform:
           - linux/amd64
-          # - linux/arm64
+          - linux/arm64
     steps:
       -
         name: Cancel previous run in progress
@@ -93,6 +93,7 @@ jobs:
           context: .
           file: ./Dockerfiles/file-monitor.Dockerfile
           build-args: |
+            TARGETPLATFORM=${{ matrix.platform }}
             MALCOLM_VERSION=${{ steps.extract_malcolm_version.outputs.mversion }}
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}

diff --git a/.github/workflows/file-upload-build-and-push-ghcr.yml b/.github/workflows/file-upload-build-and-push-ghcr.yml
@@ -37,7 +37,7 @@ jobs:
       matrix:
         platform:
           - linux/amd64
-          # - linux/arm64
+          - linux/arm64
     steps:
       -
         name: Cancel previous run in progress
@@ -95,6 +95,7 @@ jobs:
           context: .
           file: ./Dockerfiles/file-upload.Dockerfile
           build-args: |
+            TARGETPLATFORM=${{ matrix.platform }}
             MALCOLM_VERSION=${{ steps.extract_malcolm_version.outputs.mversion }}
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}

diff --git a/.github/workflows/filebeat-build-and-push-ghcr.yml b/.github/workflows/filebeat-build-and-push-ghcr.yml
@@ -37,7 +37,7 @@ jobs:
       matrix:
         platform:
           - linux/amd64
-          # - linux/arm64
+          - linux/arm64
     steps:
       -
         name: Cancel previous run in progress
@@ -95,6 +95,7 @@ jobs:
           context: .
           file: ./Dockerfiles/filebeat.Dockerfile
           build-args: |
+            TARGETPLATFORM=${{ matrix.platform }}
             MALCOLM_VERSION=${{ steps.extract_malcolm_version.outputs.mversion }}
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}

diff --git a/.github/workflows/freq-build-and-push-ghcr.yml b/.github/workflows/freq-build-and-push-ghcr.yml
@@ -37,7 +37,7 @@ jobs:
       matrix:
         platform:
           - linux/amd64
-          # - linux/arm64
+          - linux/arm64
     steps:
       -
         name: Cancel previous run in progress
@@ -95,6 +95,7 @@ jobs:
           context: .
           file: ./Dockerfiles/freq.Dockerfile
           build-args: |
+            TARGETPLATFORM=${{ matrix.platform }}
             MALCOLM_VERSION=${{ steps.extract_malcolm_version.outputs.mversion }}
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}

diff --git a/.github/workflows/htadmin-build-and-push-ghcr.yml b/.github/workflows/htadmin-build-and-push-ghcr.yml
@@ -37,7 +37,7 @@ jobs:
       matrix:
         platform:
           - linux/amd64
-          # - linux/arm64
+          - linux/arm64
     steps:
       -
         name: Cancel previous run in progress
@@ -95,6 +95,7 @@ jobs:
           context: .
           file: ./Dockerfiles/htadmin.Dockerfile
           build-args: |
+            TARGETPLATFORM=${{ matrix.platform }}
             MALCOLM_VERSION=${{ steps.extract_malcolm_version.outputs.mversion }}
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}

diff --git a/.github/workflows/logstash-build-and-push-ghcr.yml b/.github/workflows/logstash-build-and-push-ghcr.yml
@@ -37,7 +37,7 @@ jobs:
       matrix:
         platform:
           - linux/amd64
-          # - linux/arm64
+          - linux/arm64
     steps:
       -
         name: Cancel previous run in progress
@@ -95,6 +95,7 @@ jobs:
           context: .
           file: ./Dockerfiles/logstash.Dockerfile
           build-args: |
+            TARGETPLATFORM=${{ matrix.platform }}
             MALCOLM_VERSION=${{ steps.extract_malcolm_version.outputs.mversion }}
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}

diff --git a/.github/workflows/netbox-build-and-push-ghcr.yml b/.github/workflows/netbox-build-and-push-ghcr.yml
@@ -37,7 +37,7 @@ jobs:
       matrix:
         platform:
           - linux/amd64
-          # - linux/arm64
+          - linux/arm64
     steps:
       -
         name: Cancel previous run in progress
@@ -95,6 +95,7 @@ jobs:
           context: .
           file: ./Dockerfiles/netbox.Dockerfile
           build-args: |
+            TARGETPLATFORM=${{ matrix.platform }}
             MALCOLM_VERSION=${{ steps.extract_malcolm_version.outputs.mversion }}
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}

diff --git a/.github/workflows/nginx-build-and-push-ghcr.yml b/.github/workflows/nginx-build-and-push-ghcr.yml
@@ -43,7 +43,7 @@ jobs:
       matrix:
         platform:
           - linux/amd64
-          # - linux/arm64
+          - linux/arm64
     steps:
       -
         name: Cancel previous run in progress
@@ -101,6 +101,7 @@ jobs:
           context: .
           file: ./Dockerfiles/nginx.Dockerfile
           build-args: |
+            TARGETPLATFORM=${{ matrix.platform }}
             MALCOLM_VERSION=${{ steps.extract_malcolm_version.outputs.mversion }}
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}

diff --git a/.github/workflows/opensearch-build-and-push-ghcr.yml b/.github/workflows/opensearch-build-and-push-ghcr.yml
@@ -36,7 +36,7 @@ jobs:
       matrix:
         platform:
           - linux/amd64
-          # - linux/arm64
+          - linux/arm64
     steps:
       -
         name: Cancel previous run in progress
@@ -94,6 +94,7 @@ jobs:
           context: .
           file: ./Dockerfiles/opensearch.Dockerfile
           build-args: |
+            TARGETPLATFORM=${{ matrix.platform }}
             MALCOLM_VERSION=${{ steps.extract_malcolm_version.outputs.mversion }}
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}

diff --git a/.github/workflows/pcap-capture-build-and-push-ghcr.yml b/.github/workflows/pcap-capture-build-and-push-ghcr.yml
@@ -37,7 +37,7 @@ jobs:
       matrix:
         platform:
           - linux/amd64
-          # - linux/arm64
+          - linux/arm64
     steps:
       -
         name: Cancel previous run in progress
@@ -95,6 +95,7 @@ jobs:
           context: .
           file: ./Dockerfiles/pcap-capture.Dockerfile
           build-args: |
+            TARGETPLATFORM=${{ matrix.platform }}
             MALCOLM_VERSION=${{ steps.extract_malcolm_version.outputs.mversion }}
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}

diff --git a/.github/workflows/pcap-monitor-build-and-push-ghcr.yml b/.github/workflows/pcap-monitor-build-and-push-ghcr.yml
@@ -37,7 +37,7 @@ jobs:
       matrix:
         platform:
           - linux/amd64
-          # - linux/arm64
+          - linux/arm64
     steps:
       -
         name: Cancel previous run in progress
@@ -95,6 +95,7 @@ jobs:
           context: .
           file: ./Dockerfiles/pcap-monitor.Dockerfile
           build-args: |
+            TARGETPLATFORM=${{ matrix.platform }}
             MALCOLM_VERSION=${{ steps.extract_malcolm_version.outputs.mversion }}
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}

diff --git a/.github/workflows/postgresql-build-and-push-ghcr.yml b/.github/workflows/postgresql-build-and-push-ghcr.yml
@@ -36,7 +36,7 @@ jobs:
       matrix:
         platform:
           - linux/amd64
-          # - linux/arm64
+          - linux/arm64
     steps:
       -
         name: Cancel previous run in progress
@@ -94,6 +94,7 @@ jobs:
           context: .
           file: ./Dockerfiles/postgresql.Dockerfile
           build-args: |
+            TARGETPLATFORM=${{ matrix.platform }}
             MALCOLM_VERSION=${{ steps.extract_malcolm_version.outputs.mversion }}
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}

diff --git a/.github/workflows/redis-build-and-push-ghcr.yml b/.github/workflows/redis-build-and-push-ghcr.yml
@@ -36,7 +36,7 @@ jobs:
       matrix:
         platform:
           - linux/amd64
-          # - linux/arm64
+          - linux/arm64
     steps:
       -
         name: Cancel previous run in progress
@@ -94,6 +94,7 @@ jobs:
           context: .
           file: ./Dockerfiles/redis.Dockerfile
           build-args: |
+            TARGETPLATFORM=${{ matrix.platform }}
             MALCOLM_VERSION=${{ steps.extract_malcolm_version.outputs.mversion }}
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}

diff --git a/.github/workflows/suricata-build-and-push-ghcr.yml b/.github/workflows/suricata-build-and-push-ghcr.yml
@@ -36,7 +36,7 @@ jobs:
       matrix:
         platform:
           - linux/amd64
-          # - linux/arm64
+          - linux/arm64
     steps:
       -
         name: Cancel previous run in progress
@@ -94,6 +94,7 @@ jobs:
           context: .
           file: ./Dockerfiles/suricata.Dockerfile
           build-args: |
+            TARGETPLATFORM=${{ matrix.platform }}
             MALCOLM_VERSION=${{ steps.extract_malcolm_version.outputs.mversion }}
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}

diff --git a/.github/workflows/zeek-build-and-push-ghcr.yml b/.github/workflows/zeek-build-and-push-ghcr.yml
@@ -36,7 +36,7 @@ jobs:
       matrix:
         platform:
           - linux/amd64
-          # - linux/arm64
+          - linux/arm64
     steps:
       -
         name: Cancel previous run in progress
@@ -95,6 +95,7 @@ jobs:
           file: ./Dockerfiles/zeek.Dockerfile
           build-args: |
             BUILD_JOBS=2
+            TARGETPLATFORM=${{ matrix.platform }}
             MALCOLM_VERSION=${{ steps.extract_malcolm_version.outputs.mversion }}
             BUILD_DATE=${{ steps.generate_build_timestamp.outputs.btimestamp }}
             VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}

diff --git a/Dockerfiles/api.Dockerfile b/Dockerfiles/api.Dockerfile
@@ -1,4 +1,6 @@
-FROM python:3-slim-bookworm as builder
+ARG TARGETPLATFORM=linux/amd64
+
+FROM --platform=${TARGETPLATFORM} python:3-slim-bookworm as builder
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV TERM xterm
@@ -18,7 +20,7 @@ WORKDIR /usr/src/app
 RUN python3 -m pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/app/wheels -r requirements.txt \
     && flake8 --ignore=E203,E501,F401,W503
 
-FROM python:3-slim-bookworm
+FROM --platform=${TARGETPLATFORM} python:3-slim-bookworm
 
 # Copyright (c) 2024 Battelle Energy Alliance, LLC.  All rights reserved.
 LABEL maintainer="malcolm@inl.gov"

diff --git a/Dockerfiles/arkime.Dockerfile b/Dockerfiles/arkime.Dockerfile
@@ -1,4 +1,6 @@
-FROM debian:12-slim AS build
+ARG TARGETPLATFORM=linux/amd64
+
+FROM --platform=${TARGETPLATFORM} debian:12-slim AS build
 
 # Copyright (c) 2024 Battelle Energy Alliance, LLC.  All rights reserved.
 
@@ -79,7 +81,7 @@ RUN export DEBARCH=$(dpkg --print-architecture) && \
     curl -fsSL -o "${ARKIME_DIR}/plugins/ja4plus.${DEBARCH}.so" "https://github.com/arkime/arkime/releases/download/${ARKIME_VERSION}/ja4plus.${DEBARCH}.so" && \
     chmod 755 "${ARKIME_DIR}/plugins/ja4plus.${DEBARCH}.so"
 
-FROM debian:12-slim
+FROM --platform=${TARGETPLATFORM} debian:12-slim
 
 LABEL maintainer="malcolm@inl.gov"
 LABEL org.opencontainers.image.authors='malcolm@inl.gov'

diff --git a/Dockerfiles/dashboards-helper.Dockerfile b/Dockerfiles/dashboards-helper.Dockerfile
@@ -1,4 +1,6 @@
-FROM alpine:3.19
+ARG TARGETPLATFORM=linux/amd64
+
+FROM --platform=${TARGETPLATFORM} alpine:3.19
 
 # Copyright (c) 2020 Battelle Energy Alliance, LLC.  All rights reserved.
 LABEL maintainer="malcolm@inl.gov"

diff --git a/Dockerfiles/dashboards.Dockerfile b/Dockerfiles/dashboards.Dockerfile
@@ -1,4 +1,6 @@
-FROM opensearchproject/opensearch-dashboards:2.13.0
+ARG TARGETPLATFORM=linux/amd64
+
+FROM --platform=${TARGETPLATFORM} opensearchproject/opensearch-dashboards:2.13.0
 
 LABEL maintainer="malcolm@inl.gov"
 LABEL org.opencontainers.image.authors='malcolm@inl.gov'

diff --git a/Dockerfiles/dirinit.Dockerfile b/Dockerfiles/dirinit.Dockerfile
@@ -1,4 +1,6 @@
-FROM alpine:3.19
+ARG TARGETPLATFORM=linux/amd64
+
+FROM --platform=${TARGETPLATFORM} alpine:3.19
 
 # Copyright (c) 2024 Battelle Energy Alliance, LLC.  All rights reserved.
 LABEL maintainer="malcolm@inl.gov"