Skip to content

Commit e88b0bf

Browse files
RogerZhongAWSRogerZhongAWS
committed
fix arm docker builds
1 parent c9971aa commit e88b0bf

File tree

5 files changed

+19
-81
lines changed

5 files changed

+19
-81
lines changed

‎.github/docker-images/base-images/device-client/amazonlinux/Dockerfile

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
FROM amazonlinux:2 as base
22

3+
ARG TARGETPLATFORM=linux/amd64
34
ARG OPENSSL_VERSION=3.0.8
45

56
###############################################################################
@@ -24,8 +25,10 @@ RUN yum -y update \
2425
&& rm -rf /var/cache/yum
2526

2627
WORKDIR /tmp
27-
RUN wget https://registrationcenter-download.intel.com/akdlm/IRC_NAS/e7797b12-ce87-4df0-aa09-df4a272fc5d9/intel-vtune-2025.0.0.1130.sh \
28-
&& sh ./intel-vtune-2025.0.0.1130.sh -a --silent --eula accept
28+
RUN if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then \
29+
wget https://registrationcenter-download.intel.com/akdlm/IRC_NAS/e7797b12-ce87-4df0-aa09-df4a272fc5d9/intel-vtune-2025.0.0.1130.sh \
30+
&& sh ./intel-vtune-2025.0.0.1130.sh -a --silent --eula accept \
31+
fi
2932

3033
###############################################################################
3134
# Install OpenSSL 3.0.8

‎.github/docker-images/base-images/device-client/ubi8/Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#https://access.redhat.com/RegistryAuthentication
33
FROM registry.access.redhat.com/ubi8/ubi AS base
44

5+
ARG TARGETPLATFORM=linux/amd64
56
ARG OPENSSL_VERSION=3.0.8
67

78
###############################################################################
@@ -28,8 +29,11 @@ RUN yum -y install \
2829
&& rm -rf /var/cache/yum
2930

3031
WORKDIR /tmp
31-
RUN wget https://registrationcenter-download.intel.com/akdlm/IRC_NAS/e7797b12-ce87-4df0-aa09-df4a272fc5d9/intel-vtune-2025.0.0.1130.sh \
32-
&& sh ./intel-vtune-2025.0.0.1130.sh -a --silent --eula accept
32+
RUN if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then \
33+
wget https://registrationcenter-download.intel.com/akdlm/IRC_NAS/e7797b12-ce87-4df0-aa09-df4a272fc5d9/intel-vtune-2025.0.0.1130.sh \
34+
&& sh ./intel-vtune-2025.0.0.1130.sh -a --silent --eula accept \
35+
fi
36+
3337

3438
###############################################################################
3539
# Install pre-built CMake

‎.github/docker-images/base-images/integration-tests/amazonlinux/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
FROM public.ecr.aws/amazonlinux/amazonlinux:2.0.20230307.0
2-
1+
FROM public.ecr.aws/amazonlinux/amazonlinux:2
32
ARG OPENSSL_VERSION=3.0.8
43

54
RUN yum -y update && yum -y install \

‎.github/docker-images/base-images/integration-tests/ubuntu/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:22.04
22

33
ARG OPENSSL_VERSION=3.0.8
44

@@ -10,7 +10,8 @@ RUN apt-get update && apt-get install -y \
1010
build-essential \
1111
cmake \
1212
libtool \
13-
zlib1g-dev
13+
zlib1g-dev \
14+
libssl-dev
1415

1516
RUN mkdir /openssl && cd /openssl && wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \
1617
&& tar -zxvf openssl-${OPENSSL_VERSION}.tar.gz \

‎.github/workflows/base-images.yml

+4-73
Original file line numberDiff line numberDiff line change
@@ -93,43 +93,6 @@ jobs:
9393
tags: |
9494
public.ecr.aws/${{ env.ECR_BASE_REPO }}:aarch64-ubuntu-latest
9595
platforms: linux/arm64
96-
build-base-docker-image-ubuntu-armv7:
97-
runs-on: ubuntu-latest
98-
permissions:
99-
id-token: write
100-
contents: read
101-
steps:
102-
- name: Configure AWS Credentials
103-
uses: aws-actions/configure-aws-credentials@v1
104-
with:
105-
aws-access-key-id: ${{ secrets.ECR_USER_AWS_KEY_ID }}
106-
aws-secret-access-key: ${{ secrets.ECR_USER_AWS_KEY_SECRET }}
107-
aws-region: us-east-1
108-
- name: Login to ECR
109-
run: aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws
110-
- name: Checkout
111-
uses: actions/checkout@v2
112-
with:
113-
fetch-depth: 0
114-
- name: Set up QEMU
115-
uses: docker/setup-qemu-action@v2
116-
- name: Docker meta
117-
id: meta
118-
uses: docker/metadata-action@v4
119-
with:
120-
images: public.ecr.aws/${{ env.ECR_REPO }}
121-
- name: Set up Docker Buildx
122-
uses: docker/setup-buildx-action@v2
123-
- name: Build ubuntu Base Image
124-
uses: docker/build-push-action@v3
125-
with:
126-
file: .github/docker-images/base-images/device-client/ubuntu/Dockerfile
127-
context: .
128-
target: base
129-
push: true
130-
tags: |
131-
public.ecr.aws/${{ env.ECR_BASE_REPO }}:armv7-ubuntu-latest
132-
platforms: linux/arm/v7
13396
build-integration-test-base-docker-image-ubuntu-x86_64:
13497
runs-on: ubuntu-latest
13598
permissions:
@@ -202,42 +165,6 @@ jobs:
202165
tags: |
203166
public.ecr.aws/${{ env.ECR_INTEG_BASE_REPO }}:aarch64-ubuntu-latest
204167
platforms: linux/amd64
205-
build-integration-test-base-docker-image-ubuntu-armv7:
206-
runs-on: ubuntu-latest
207-
permissions:
208-
id-token: write
209-
contents: read
210-
steps:
211-
- name: Configure AWS Credentials
212-
uses: aws-actions/configure-aws-credentials@v1
213-
with:
214-
aws-access-key-id: ${{ secrets.ECR_USER_AWS_KEY_ID }}
215-
aws-secret-access-key: ${{ secrets.ECR_USER_AWS_KEY_SECRET }}
216-
aws-region: us-east-1
217-
- name: Login to ECR
218-
run: aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws
219-
- name: Checkout
220-
uses: actions/checkout@v2
221-
with:
222-
fetch-depth: 0
223-
- name: Set up QEMU
224-
uses: docker/setup-qemu-action@v2
225-
- name: Docker meta
226-
id: meta
227-
uses: docker/metadata-action@v4
228-
with:
229-
images: public.ecr.aws/${{ env.ECR_INTEG_BASE_REPO }}
230-
- name: Set up Docker Buildx
231-
uses: docker/setup-buildx-action@v2
232-
- name: Build Ubuntu Base Image
233-
uses: docker/build-push-action@v3
234-
with:
235-
file: .github/docker-images/base-images/integration-tests/ubuntu/Dockerfile
236-
context: .
237-
push: true
238-
tags: |
239-
public.ecr.aws/${{ env.ECR_INTEG_BASE_REPO }}:armv7-ubuntu-latest
240-
platforms: linux/arm/v7
241168
build-base-docker-image-amazonlinux-x86_64:
242169
runs-on: ubuntu-latest
243170
permissions:
@@ -307,6 +234,8 @@ jobs:
307234
with:
308235
file: .github/docker-images/base-images/device-client/amazonlinux/Dockerfile
309236
context: .
237+
build-args: |
238+
OS=linux/arm64
310239
target: base
311240
push: true
312241
tags: |
@@ -453,6 +382,8 @@ jobs:
453382
with:
454383
file: .github/docker-images/base-images/device-client/ubi8/Dockerfile
455384
context: .
385+
build-args: |
386+
OS=linux/arm64
456387
target: base
457388
push: true
458389
tags: |

0 commit comments

Comments
 (0)