diff --git a/.github/workflows/build_wheels_manylinux.yml b/.github/workflows/build_wheels_manylinux.yml index 1e795174..3e55aa83 100644 --- a/.github/workflows/build_wheels_manylinux.yml +++ b/.github/workflows/build_wheels_manylinux.yml @@ -17,7 +17,7 @@ on: jobs: Build: - runs-on: ${{ matrix.platform == 'aarch64' && 'opencv-cn-lin-arm64' || 'ubuntu-22.04' }} + runs-on: ${{ matrix.platform == 'aarch64' && 'ubuntu-22.04-arm' || 'ubuntu-22.04' }} defaults: run: shell: bash @@ -33,7 +33,7 @@ jobs: include: - platform: aarch64 manylinux: 2014 - DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20260725 + DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20260901 - platform: x86_64 manylinux: 2014 DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20260725 @@ -42,7 +42,7 @@ jobs: DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux_2_28-x86-64:20260725 - platform: aarch64 manylinux: 2_28 - DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux_2_28-aarch64:20260725 + DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux_2_28-aarch64:20260901 env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true @@ -86,7 +86,7 @@ jobs: Test: needs: [Build] - runs-on: ${{ matrix.platform == 'aarch64' && 'opencv-cn-lin-arm64' || 'ubuntu-22.04' }} + runs-on: ${{ matrix.platform == 'aarch64' && 'ubuntu-24.04-arm' || 'ubuntu-22.04' }} defaults: run: shell: bash diff --git a/docker/manylinux2014/Dockerfile_aarch64 b/docker/manylinux2014/Dockerfile_aarch64 index b8dc69ed..9e646fe8 100644 --- a/docker/manylinux2014/Dockerfile_aarch64 +++ b/docker/manylinux2014/Dockerfile_aarch64 @@ -1,4 +1,4 @@ -# Version: 20260725 +# Version: 20260901 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64 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 cd ../.. && \ rm -rf ccache-${CCACHE_VERSION} ccache-${CCACHE_VERSION}.tar.gz -# Self-hosted runner UID is 1004 -RUN useradd ci -m -s /bin/bash -G users --uid=1004 && \ +# GitHub Actions user`s UID is 1001 +RUN useradd ci -m -s /bin/bash -G users --uid=1001 && \ mkdir /io && \ chown -R ci:ci /io && \ # This needs to find ffmpeg packages from ci user diff --git a/docker/manylinux_2_28/Dockerfile_aarch64 b/docker/manylinux_2_28/Dockerfile_aarch64 index fba959c1..a3f5287f 100644 --- a/docker/manylinux_2_28/Dockerfile_aarch64 +++ b/docker/manylinux_2_28/Dockerfile_aarch64 @@ -1,4 +1,4 @@ -# Version: 20260725 +# Version: 20260901 # Image name: quay.io/opencv-ci/opencv-python-manylinux_2_28-aarch64 FROM quay.io/pypa/manylinux_2_28_aarch64:latest @@ -105,8 +105,8 @@ RUN mkdir ~/ffmpeg_sources && \ ldconfig && \ rm -rf ~/ffmpeg_sources -# Self-hosted runner UID is 1004 -RUN useradd ci -m -s /bin/bash -G users --uid=1004 && \ +# GitHub Actions user`s UID is 1001 +RUN useradd ci -m -s /bin/bash -G users --uid=1001 && \ mkdir /io && \ chown -R ci:ci /io && \ # This needs to find ffmpeg packages from ci user diff --git a/docker/musllinux_1_2/Dockerfile_aarch64 b/docker/musllinux_1_2/Dockerfile_aarch64 index fc4ef7c5..f7cdee49 100644 --- a/docker/musllinux_1_2/Dockerfile_aarch64 +++ b/docker/musllinux_1_2/Dockerfile_aarch64 @@ -1,4 +1,4 @@ -# version: 20260725 +# version: 20260901 # Image name: quay.io/opencv-ci/opencv-python-musllinux_1_2-aarch64 FROM quay.io/pypa/musllinux_1_2_aarch64:latest @@ -161,14 +161,9 @@ RUN curl -O -L https://github.com/ccache/ccache/releases/download/v${CCACHE_VERS cd ../.. && \ rm -rf ccache-${CCACHE_VERSION} ccache-${CCACHE_VERSION}.tar.gz -# Self-hosted runner UID is 1004 -RUN useradd ci -m -s /bin/bash -G users --uid=1004 && \ - mkdir /io && \ - chown -R ci:ci /io && \ - # This needs to find ffmpeg packages from ci user - chown -R ci:ci /ffmpeg_build && \ - # This calls in mutlibuild scripts and cannot be run without permissions - chown -R ci:ci /opt/_internal/pipx/venvs/auditwheel +# user`s UID is 1001 +RUN adduser -D -u 1001 ci && mkdir /io && chown ci:ci /io && \ + chown -R ci:ci /ffmpeg_build USER ci