Skip to content

Commit 72c1f44

Browse files
authored
Merge pull request #1269 from asmorkalov:as/linux_arm_cloud
Migrate Linux ARM build to cloud too (#1269) Use new docker image with fixed permissions on ARM.
1 parent 2ba8bf6 commit 72c1f44

4 files changed

Lines changed: 14 additions & 19 deletions

File tree

.github/workflows/build_wheels_manylinux.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717

1818
jobs:
1919
Build:
20-
runs-on: ${{ matrix.platform == 'aarch64' && 'opencv-cn-lin-arm64' || 'ubuntu-22.04' }}
20+
runs-on: ${{ matrix.platform == 'aarch64' && 'ubuntu-22.04-arm' || 'ubuntu-22.04' }}
2121
defaults:
2222
run:
2323
shell: bash
@@ -33,7 +33,7 @@ jobs:
3333
include:
3434
- platform: aarch64
3535
manylinux: 2014
36-
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20260725
36+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20260901
3737
- platform: x86_64
3838
manylinux: 2014
3939
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20260725
@@ -42,7 +42,7 @@ jobs:
4242
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux_2_28-x86-64:20260725
4343
- platform: aarch64
4444
manylinux: 2_28
45-
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux_2_28-aarch64:20260725
45+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux_2_28-aarch64:20260901
4646

4747
env:
4848
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
@@ -86,7 +86,7 @@ jobs:
8686

8787
Test:
8888
needs: [Build]
89-
runs-on: ${{ matrix.platform == 'aarch64' && 'opencv-cn-lin-arm64' || 'ubuntu-22.04' }}
89+
runs-on: ${{ matrix.platform == 'aarch64' && 'ubuntu-24.04-arm' || 'ubuntu-22.04' }}
9090
defaults:
9191
run:
9292
shell: bash

docker/manylinux2014/Dockerfile_aarch64

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Version: 20260725
1+
# Version: 20260901
22
# Image name: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64
33

44
FROM quay.io/pypa/manylinux2014_aarch64:latest
@@ -157,8 +157,8 @@ RUN curl -O -L https://github.com/ccache/ccache/releases/download/v${CCACHE_VERS
157157
cd ../.. && \
158158
rm -rf ccache-${CCACHE_VERSION} ccache-${CCACHE_VERSION}.tar.gz
159159

160-
# Self-hosted runner UID is 1004
161-
RUN useradd ci -m -s /bin/bash -G users --uid=1004 && \
160+
# GitHub Actions user`s UID is 1001
161+
RUN useradd ci -m -s /bin/bash -G users --uid=1001 && \
162162
mkdir /io && \
163163
chown -R ci:ci /io && \
164164
# This needs to find ffmpeg packages from ci user

docker/manylinux_2_28/Dockerfile_aarch64

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Version: 20260725
1+
# Version: 20260901
22
# Image name: quay.io/opencv-ci/opencv-python-manylinux_2_28-aarch64
33

44
FROM quay.io/pypa/manylinux_2_28_aarch64:latest
@@ -105,8 +105,8 @@ RUN mkdir ~/ffmpeg_sources && \
105105
ldconfig && \
106106
rm -rf ~/ffmpeg_sources
107107

108-
# Self-hosted runner UID is 1004
109-
RUN useradd ci -m -s /bin/bash -G users --uid=1004 && \
108+
# GitHub Actions user`s UID is 1001
109+
RUN useradd ci -m -s /bin/bash -G users --uid=1001 && \
110110
mkdir /io && \
111111
chown -R ci:ci /io && \
112112
# This needs to find ffmpeg packages from ci user

docker/musllinux_1_2/Dockerfile_aarch64

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# version: 20260725
1+
# version: 20260901
22
# Image name: quay.io/opencv-ci/opencv-python-musllinux_1_2-aarch64
33
FROM quay.io/pypa/musllinux_1_2_aarch64:latest
44

@@ -161,14 +161,9 @@ RUN curl -O -L https://github.com/ccache/ccache/releases/download/v${CCACHE_VERS
161161
cd ../.. && \
162162
rm -rf ccache-${CCACHE_VERSION} ccache-${CCACHE_VERSION}.tar.gz
163163

164-
# Self-hosted runner UID is 1004
165-
RUN useradd ci -m -s /bin/bash -G users --uid=1004 && \
166-
mkdir /io && \
167-
chown -R ci:ci /io && \
168-
# This needs to find ffmpeg packages from ci user
169-
chown -R ci:ci /ffmpeg_build && \
170-
# This calls in mutlibuild scripts and cannot be run without permissions
171-
chown -R ci:ci /opt/_internal/pipx/venvs/auditwheel
164+
# user`s UID is 1001
165+
RUN adduser -D -u 1001 ci && mkdir /io && chown ci:ci /io && \
166+
chown -R ci:ci /ffmpeg_build
172167

173168
USER ci
174169

0 commit comments

Comments
 (0)