From 11aef91b44a1a955921ba1e136506d95a44d93a1 Mon Sep 17 00:00:00 2001 From: RogerZhongAWS Date: Tue, 17 Dec 2024 19:29:57 +0000 Subject: [PATCH 1/6] build base images upon push to main --- .github/workflows/base-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/base-images.yml b/.github/workflows/base-images.yml index f602ce04..a9fb6470 100644 --- a/.github/workflows/base-images.yml +++ b/.github/workflows/base-images.yml @@ -7,7 +7,7 @@ name: Base Image Builds on: push: - branches: ['base-images'] + branches: ['base-images', 'main'] pull_request: branches: ['base-images'] types: [opened, closed] From 27c1de6994ed25ffd4c3f58ae4b626ff3c169eb0 Mon Sep 17 00:00:00 2001 From: RogerZhongAWS Date: Thu, 19 Dec 2024 18:23:31 +0000 Subject: [PATCH 2/6] fix ubuntu base build --- .../base-images/device-client/ubuntu/Dockerfile | 9 +++++---- .github/workflows/e2e-ci.yml | 14 +++++++------- .github/workflows/release-ci.yml | 8 ++++---- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/docker-images/base-images/device-client/ubuntu/Dockerfile b/.github/docker-images/base-images/device-client/ubuntu/Dockerfile index b01eb9ca..094c22d9 100644 --- a/.github/docker-images/base-images/device-client/ubuntu/Dockerfile +++ b/.github/docker-images/base-images/device-client/ubuntu/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 AS base +FROM ubuntu:22.04 AS base ENV DEBIAN_FRONTEND=noninteractive @@ -17,6 +17,7 @@ RUN apt-get update -qq \ libc6-dbg \ softhsm \ zlib1g-dev \ + libssl-dev \ && apt-get clean ############################################################################### @@ -35,9 +36,9 @@ RUN wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \ # Install pre-built CMake ############################################################################### WORKDIR /tmp -RUN curl -sSL https://github.com/Kitware/CMake/releases/download/v3.10.0/cmake-3.10.0.tar.gz -o cmake-3.10.0.tar.gz \ - && tar -zxvf cmake-3.10.0.tar.gz \ - && cd cmake-3.10.0 \ +RUN curl -sSL https://github.com/Kitware/CMake/releases/download/v3.24.0/cmake-3.24.0.tar.gz -o cmake-3.24.0.tar.gz \ + && tar -zxvf cmake-3.24.0.tar.gz \ + && cd cmake-3.24.0 \ && ./bootstrap \ && make -j 2 \ && make install diff --git a/.github/workflows/e2e-ci.yml b/.github/workflows/e2e-ci.yml index 9705350c..afd89554 100644 --- a/.github/workflows/e2e-ci.yml +++ b/.github/workflows/e2e-ci.yml @@ -48,7 +48,7 @@ jobs: context: . target: deploy build-args: | - OS=ubuntu:18.04 + OS=ubuntu:22.04 BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:x86_64-ubuntu-latest push: false - name: Get Version @@ -87,7 +87,7 @@ jobs: file: .github/docker-images/Dockerfile context: . build-args: | - OS=ubuntu:18.04 + OS=ubuntu:22.04 BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:x86_64-ubuntu-latest push: true tags: | @@ -125,7 +125,7 @@ jobs: file: .github/docker-images/Dockerfile context: . build-args: | - OS=ubuntu:18.04 + OS=ubuntu:22.04 BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:aarch64-ubuntu-latest push: true tags: | @@ -165,7 +165,7 @@ jobs: file: .github/docker-images/Dockerfile context: . build-args: | - OS=ubuntu:18.04 + OS=ubuntu:22.04 BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:armv7-ubuntu-latest push: true tags: | @@ -355,7 +355,7 @@ jobs: file: .github/docker-images/integration-tests/ubuntu/Dockerfile context: . build-args: | - OS=ubuntu:18.04 + OS=ubuntu:22.04 PRE_RELEASE_IMAGE=public.ecr.aws/${{ env.ECR_PRE_RELEASE_REPO }}:x86_64-ubuntu-${{ needs.versioning.outputs.version }} BASE_IMAGE=public.ecr.aws/${{ env.ECR_INTEG_BASE_REPO }}:x86_64-ubuntu-latest push: true @@ -401,7 +401,7 @@ jobs: file: .github/docker-images/integration-tests/ubuntu/Dockerfile context: . build-args: | - OS=ubuntu:18.04 + OS=ubuntu:22.04 PRE_RELEASE_IMAGE=public.ecr.aws/${{ env.ECR_PRE_RELEASE_REPO }}:aarch64-ubuntu-${{ needs.versioning.outputs.version }} BASE_IMAGE=public.ecr.aws/${{ env.ECR_INTEG_BASE_REPO }}:aarch64-ubuntu-latest push: true @@ -444,7 +444,7 @@ jobs: file: .github/docker-images/integration-tests/ubuntu/Dockerfile context: . build-args: | - OS=ubuntu:18.04 + OS=ubuntu:22.04 PRE_RELEASE_IMAGE=public.ecr.aws/${{ env.ECR_PRE_RELEASE_REPO }}:armv7-ubuntu-${{ needs.versioning.outputs.version }} BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:armv7-ubuntu-latest push: true diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 134064b0..ccffbcf8 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -41,7 +41,7 @@ jobs: context: . target: deploy build-args: | - OS=ubuntu:18.04 + OS=ubuntu:22.04 BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:x86_64-ubuntu-latest push: false - name: Get Version @@ -83,7 +83,7 @@ jobs: file: .github/docker-images/Dockerfile context: . build-args: | - OS=ubuntu:18.04 + OS=ubuntu:22.04 BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:x86_64-ubuntu-latest push: true tags: | @@ -124,7 +124,7 @@ jobs: file: .github/docker-images/Dockerfile context: . build-args: | - OS=ubuntu:18.04 + OS=ubuntu:22.04 BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:aarch64-ubuntu-latest push: true tags: | @@ -165,7 +165,7 @@ jobs: file: .github/docker-images/Dockerfile context: . build-args: | - OS=ubuntu:18.04 + OS=ubuntu:22.04 BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:armv7-ubuntu-latest push: true tags: | From c9971aaf21904ba8dcad56fb234830e0069d790d Mon Sep 17 00:00:00 2001 From: RogerZhongAWS Date: Fri, 20 Dec 2024 10:39:02 +0000 Subject: [PATCH 3/6] fix amazonlinux and ubi8 base builds --- .../device-client/amazonlinux/Dockerfile | 6 +++- .../base-images/device-client/ubi8/Dockerfile | 28 ++++++++----------- .github/workflows/e2e-ci.yml | 4 +-- .github/workflows/release-ci.yml | 4 +-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/docker-images/base-images/device-client/amazonlinux/Dockerfile b/.github/docker-images/base-images/device-client/amazonlinux/Dockerfile index 24a0a9b5..58deb833 100644 --- a/.github/docker-images/base-images/device-client/amazonlinux/Dockerfile +++ b/.github/docker-images/base-images/device-client/amazonlinux/Dockerfile @@ -1,4 +1,4 @@ -FROM amazonlinux:2.0.20230307.0 as base +FROM amazonlinux:2 as base ARG OPENSSL_VERSION=3.0.8 @@ -23,6 +23,10 @@ RUN yum -y update \ && yum clean all \ && rm -rf /var/cache/yum +WORKDIR /tmp +RUN wget https://registrationcenter-download.intel.com/akdlm/IRC_NAS/e7797b12-ce87-4df0-aa09-df4a272fc5d9/intel-vtune-2025.0.0.1130.sh \ + && sh ./intel-vtune-2025.0.0.1130.sh -a --silent --eula accept + ############################################################################### # Install OpenSSL 3.0.8 ############################################################################### diff --git a/.github/docker-images/base-images/device-client/ubi8/Dockerfile b/.github/docker-images/base-images/device-client/ubi8/Dockerfile index 3cbb3746..1c791125 100644 --- a/.github/docker-images/base-images/device-client/ubi8/Dockerfile +++ b/.github/docker-images/base-images/device-client/ubi8/Dockerfile @@ -8,7 +8,9 @@ ARG OPENSSL_VERSION=3.0.8 # Install prereqs ############################################################################### RUN yum -y update \ - && yum -y install \ + && yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm + +RUN yum -y install \ tar \ bzip2 \ git \ @@ -20,16 +22,22 @@ RUN yum -y update \ gcc-c++ \ perl-IPC-Cmd \ perl-Pod-Html \ + softhsm \ + openssl-devel \ && yum clean all \ && rm -rf /var/cache/yum +WORKDIR /tmp +RUN wget https://registrationcenter-download.intel.com/akdlm/IRC_NAS/e7797b12-ce87-4df0-aa09-df4a272fc5d9/intel-vtune-2025.0.0.1130.sh \ + && sh ./intel-vtune-2025.0.0.1130.sh -a --silent --eula accept + ############################################################################### # Install pre-built CMake ############################################################################### WORKDIR /tmp -RUN curl -sSL https://github.com/Kitware/CMake/releases/download/v3.10.0/cmake-3.10.0.tar.gz -o cmake-3.10.0.tar.gz \ - && tar -zxvf cmake-3.10.0.tar.gz \ - && cd cmake-3.10.0 \ +RUN curl -sSL https://github.com/Kitware/CMake/releases/download/v3.24.0/cmake-3.24.0.tar.gz -o cmake-3.24.0.tar.gz \ + && tar -zxvf cmake-3.24.0.tar.gz \ + && cd cmake-3.24.0 \ && ./bootstrap \ && make \ && make install @@ -45,18 +53,6 @@ RUN wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \ && make \ && make install -############################################################################### -# Install softhsm v2.3.0 from source -############################################################################### - -WORKDIR /tmp -RUN wget https://dist.opendnssec.org/source/softhsm-2.3.0.tar.gz \ - && tar -xzf softhsm-2.3.0.tar.gz \ - && cd softhsm-2.3.0 \ - && ./configure --disable-gost \ - && make \ - && make install - ############################################################################### # Clone and build Google Test ############################################################################### diff --git a/.github/workflows/e2e-ci.yml b/.github/workflows/e2e-ci.yml index afd89554..245fb42d 100644 --- a/.github/workflows/e2e-ci.yml +++ b/.github/workflows/e2e-ci.yml @@ -203,7 +203,7 @@ jobs: file: .github/docker-images/Dockerfile context: . build-args: | - OS=amazonlinux:2022.0.20221207.4 + OS=amazonlinux:2 BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:x86_64-amazonlinux-latest push: true tags: | @@ -241,7 +241,7 @@ jobs: file: .github/docker-images/Dockerfile context: . build-args: | - OS=amazonlinux:2022.0.20221207.4 + OS=amazonlinux:2 BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:aarch64-amazonlinux-latest push: true tags: | diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index ccffbcf8..734bfeca 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -206,7 +206,7 @@ jobs: file: .github/docker-images/Dockerfile context: . build-args: | - OS=amazonlinux:latest + OS=amazonlinux:2 BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:x86_64-amazonlinux-latest push: true tags: | @@ -247,7 +247,7 @@ jobs: file: .github/docker-images/Dockerfile context: . build-args: | - OS=amazonlinux:latest + OS=amazonlinux:2 BASE_IMAGE=public.ecr.aws/${{ env.ECR_BASE_REPO }}:aarch64-amazonlinux-latest push: true tags: | From e88b0bfe2d347e25ac802a935e31b42a9d008d36 Mon Sep 17 00:00:00 2001 From: RogerZhongAWS Date: Fri, 20 Dec 2024 20:04:09 +0000 Subject: [PATCH 4/6] fix arm docker builds --- .../device-client/amazonlinux/Dockerfile | 7 +- .../base-images/device-client/ubi8/Dockerfile | 8 +- .../integration-tests/amazonlinux/Dockerfile | 3 +- .../integration-tests/ubuntu/Dockerfile | 5 +- .github/workflows/base-images.yml | 77 +------------------ 5 files changed, 19 insertions(+), 81 deletions(-) diff --git a/.github/docker-images/base-images/device-client/amazonlinux/Dockerfile b/.github/docker-images/base-images/device-client/amazonlinux/Dockerfile index 58deb833..f8d44146 100644 --- a/.github/docker-images/base-images/device-client/amazonlinux/Dockerfile +++ b/.github/docker-images/base-images/device-client/amazonlinux/Dockerfile @@ -1,5 +1,6 @@ FROM amazonlinux:2 as base +ARG TARGETPLATFORM=linux/amd64 ARG OPENSSL_VERSION=3.0.8 ############################################################################### @@ -24,8 +25,10 @@ RUN yum -y update \ && rm -rf /var/cache/yum WORKDIR /tmp -RUN wget https://registrationcenter-download.intel.com/akdlm/IRC_NAS/e7797b12-ce87-4df0-aa09-df4a272fc5d9/intel-vtune-2025.0.0.1130.sh \ - && sh ./intel-vtune-2025.0.0.1130.sh -a --silent --eula accept +RUN if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then \ + wget https://registrationcenter-download.intel.com/akdlm/IRC_NAS/e7797b12-ce87-4df0-aa09-df4a272fc5d9/intel-vtune-2025.0.0.1130.sh \ + && sh ./intel-vtune-2025.0.0.1130.sh -a --silent --eula accept \ + fi ############################################################################### # Install OpenSSL 3.0.8 diff --git a/.github/docker-images/base-images/device-client/ubi8/Dockerfile b/.github/docker-images/base-images/device-client/ubi8/Dockerfile index 1c791125..23df7c78 100644 --- a/.github/docker-images/base-images/device-client/ubi8/Dockerfile +++ b/.github/docker-images/base-images/device-client/ubi8/Dockerfile @@ -2,6 +2,7 @@ #https://access.redhat.com/RegistryAuthentication FROM registry.access.redhat.com/ubi8/ubi AS base +ARG TARGETPLATFORM=linux/amd64 ARG OPENSSL_VERSION=3.0.8 ############################################################################### @@ -28,8 +29,11 @@ RUN yum -y install \ && rm -rf /var/cache/yum WORKDIR /tmp -RUN wget https://registrationcenter-download.intel.com/akdlm/IRC_NAS/e7797b12-ce87-4df0-aa09-df4a272fc5d9/intel-vtune-2025.0.0.1130.sh \ - && sh ./intel-vtune-2025.0.0.1130.sh -a --silent --eula accept +RUN if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then \ + wget https://registrationcenter-download.intel.com/akdlm/IRC_NAS/e7797b12-ce87-4df0-aa09-df4a272fc5d9/intel-vtune-2025.0.0.1130.sh \ + && sh ./intel-vtune-2025.0.0.1130.sh -a --silent --eula accept \ + fi + ############################################################################### # Install pre-built CMake diff --git a/.github/docker-images/base-images/integration-tests/amazonlinux/Dockerfile b/.github/docker-images/base-images/integration-tests/amazonlinux/Dockerfile index 62ab3151..b651d627 100644 --- a/.github/docker-images/base-images/integration-tests/amazonlinux/Dockerfile +++ b/.github/docker-images/base-images/integration-tests/amazonlinux/Dockerfile @@ -1,5 +1,4 @@ -FROM public.ecr.aws/amazonlinux/amazonlinux:2.0.20230307.0 - +FROM public.ecr.aws/amazonlinux/amazonlinux:2 ARG OPENSSL_VERSION=3.0.8 RUN yum -y update && yum -y install \ diff --git a/.github/docker-images/base-images/integration-tests/ubuntu/Dockerfile b/.github/docker-images/base-images/integration-tests/ubuntu/Dockerfile index edcf5c0f..aed760aa 100644 --- a/.github/docker-images/base-images/integration-tests/ubuntu/Dockerfile +++ b/.github/docker-images/base-images/integration-tests/ubuntu/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM ubuntu:22.04 ARG OPENSSL_VERSION=3.0.8 @@ -10,7 +10,8 @@ RUN apt-get update && apt-get install -y \ build-essential \ cmake \ libtool \ - zlib1g-dev + zlib1g-dev \ + libssl-dev RUN mkdir /openssl && cd /openssl && wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \ && tar -zxvf openssl-${OPENSSL_VERSION}.tar.gz \ diff --git a/.github/workflows/base-images.yml b/.github/workflows/base-images.yml index a9fb6470..909fc9f2 100644 --- a/.github/workflows/base-images.yml +++ b/.github/workflows/base-images.yml @@ -93,43 +93,6 @@ jobs: tags: | public.ecr.aws/${{ env.ECR_BASE_REPO }}:aarch64-ubuntu-latest platforms: linux/arm64 - build-base-docker-image-ubuntu-armv7: - runs-on: ubuntu-latest - permissions: - id-token: write - contents: read - steps: - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.ECR_USER_AWS_KEY_ID }} - aws-secret-access-key: ${{ secrets.ECR_USER_AWS_KEY_SECRET }} - aws-region: us-east-1 - - name: Login to ECR - run: aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Docker meta - id: meta - uses: docker/metadata-action@v4 - with: - images: public.ecr.aws/${{ env.ECR_REPO }} - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: Build ubuntu Base Image - uses: docker/build-push-action@v3 - with: - file: .github/docker-images/base-images/device-client/ubuntu/Dockerfile - context: . - target: base - push: true - tags: | - public.ecr.aws/${{ env.ECR_BASE_REPO }}:armv7-ubuntu-latest - platforms: linux/arm/v7 build-integration-test-base-docker-image-ubuntu-x86_64: runs-on: ubuntu-latest permissions: @@ -202,42 +165,6 @@ jobs: tags: | public.ecr.aws/${{ env.ECR_INTEG_BASE_REPO }}:aarch64-ubuntu-latest platforms: linux/amd64 - build-integration-test-base-docker-image-ubuntu-armv7: - runs-on: ubuntu-latest - permissions: - id-token: write - contents: read - steps: - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.ECR_USER_AWS_KEY_ID }} - aws-secret-access-key: ${{ secrets.ECR_USER_AWS_KEY_SECRET }} - aws-region: us-east-1 - - name: Login to ECR - run: aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Docker meta - id: meta - uses: docker/metadata-action@v4 - with: - images: public.ecr.aws/${{ env.ECR_INTEG_BASE_REPO }} - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: Build Ubuntu Base Image - uses: docker/build-push-action@v3 - with: - file: .github/docker-images/base-images/integration-tests/ubuntu/Dockerfile - context: . - push: true - tags: | - public.ecr.aws/${{ env.ECR_INTEG_BASE_REPO }}:armv7-ubuntu-latest - platforms: linux/arm/v7 build-base-docker-image-amazonlinux-x86_64: runs-on: ubuntu-latest permissions: @@ -307,6 +234,8 @@ jobs: with: file: .github/docker-images/base-images/device-client/amazonlinux/Dockerfile context: . + build-args: | + OS=linux/arm64 target: base push: true tags: | @@ -453,6 +382,8 @@ jobs: with: file: .github/docker-images/base-images/device-client/ubi8/Dockerfile context: . + build-args: | + OS=linux/arm64 target: base push: true tags: | From ac6dd92be642e567cf43b1a55595b570a4dc463a Mon Sep 17 00:00:00 2001 From: RogerZhongAWS Date: Fri, 20 Dec 2024 22:43:17 +0000 Subject: [PATCH 5/6] fix syntax --- .../base-images/device-client/amazonlinux/Dockerfile | 2 +- .github/docker-images/base-images/device-client/ubi8/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/docker-images/base-images/device-client/amazonlinux/Dockerfile b/.github/docker-images/base-images/device-client/amazonlinux/Dockerfile index f8d44146..134900fa 100644 --- a/.github/docker-images/base-images/device-client/amazonlinux/Dockerfile +++ b/.github/docker-images/base-images/device-client/amazonlinux/Dockerfile @@ -27,7 +27,7 @@ RUN yum -y update \ WORKDIR /tmp RUN if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then \ wget https://registrationcenter-download.intel.com/akdlm/IRC_NAS/e7797b12-ce87-4df0-aa09-df4a272fc5d9/intel-vtune-2025.0.0.1130.sh \ - && sh ./intel-vtune-2025.0.0.1130.sh -a --silent --eula accept \ + && sh ./intel-vtune-2025.0.0.1130.sh -a --silent --eula accept; \ fi ############################################################################### diff --git a/.github/docker-images/base-images/device-client/ubi8/Dockerfile b/.github/docker-images/base-images/device-client/ubi8/Dockerfile index 23df7c78..8da82fdb 100644 --- a/.github/docker-images/base-images/device-client/ubi8/Dockerfile +++ b/.github/docker-images/base-images/device-client/ubi8/Dockerfile @@ -31,7 +31,7 @@ RUN yum -y install \ WORKDIR /tmp RUN if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then \ wget https://registrationcenter-download.intel.com/akdlm/IRC_NAS/e7797b12-ce87-4df0-aa09-df4a272fc5d9/intel-vtune-2025.0.0.1130.sh \ - && sh ./intel-vtune-2025.0.0.1130.sh -a --silent --eula accept \ + && sh ./intel-vtune-2025.0.0.1130.sh -a --silent --eula accept; \ fi From c90312b33cf1aec5885d7954a5e0ffe41ba40bc0 Mon Sep 17 00:00:00 2001 From: RogerZhongAWS Date: Fri, 20 Dec 2024 23:17:54 +0000 Subject: [PATCH 6/6] fix typo --- .github/workflows/base-images.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/base-images.yml b/.github/workflows/base-images.yml index 909fc9f2..d8777470 100644 --- a/.github/workflows/base-images.yml +++ b/.github/workflows/base-images.yml @@ -235,7 +235,7 @@ jobs: file: .github/docker-images/base-images/device-client/amazonlinux/Dockerfile context: . build-args: | - OS=linux/arm64 + TARGETPLATFORM=linux/arm64 target: base push: true tags: | @@ -383,7 +383,7 @@ jobs: file: .github/docker-images/base-images/device-client/ubi8/Dockerfile context: . build-args: | - OS=linux/arm64 + TARGETPLATFORM=linux/arm64 target: base push: true tags: |