Skip to content

Commit 8dda3b9

Browse files
authored
Merge pull request #1867 from alicevision/fix/CI
[docker] Dependencies: Add a symlink to `python3` to make `python` callable
2 parents 81d1189 + 882cdf4 commit 8dda3b9

File tree

5 files changed

+10
-4
lines changed

5 files changed

+10
-4
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-latest
2424
strategy:
2525
matrix:
26-
container: ["alicevision/alicevision-deps:2025.03.27-ubuntu22.04-cuda12.1.1", "alicevision/alicevision-deps:2025.03.27-rocky9-cuda12.1.1"]
26+
container: ["alicevision/alicevision-deps:2025.05.15-ubuntu22.04-cuda12.1.1", "alicevision/alicevision-deps:2025.05.15-rocky9-cuda12.1.1"]
2727
container:
2828
image: ${{ matrix.container }}
2929
env:
@@ -33,7 +33,7 @@ jobs:
3333
ALICEVISION_ROOT: ${{ github.workspace }}/../AV_install
3434
ALICEVISION_SENSOR_DB: ${{ github.workspace }}/../AV_install/share/aliceVision/cameraSensors.db
3535
ALICEVISION_LENS_PROFILE_INFO: ""
36-
BUILD_CCTAG: "${{ matrix.container == 'alicevision/alicevision-deps:2025.03.27-ubuntu22.04-cuda12.1.1' && 'ON' || 'OFF' }}"
36+
BUILD_CCTAG: "${{ matrix.container == 'alicevision/alicevision-deps:2025.05.15-ubuntu22.04-cuda12.1.1' && 'ON' || 'OFF' }}"
3737
steps:
3838
- uses: actions/checkout@v1
3939

docker/Dockerfile_rocky_deps

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ RUN cmake "${AV_DEV}" \
7878
RUN mkdir -p "${AV_INSTALL}/lib" && \
7979
ln -s lib "${AV_INSTALL}/lib64"
8080

81+
# Symlink to Python3 executable in case a call to "python" instead of "python3" is ever made
82+
RUN ln -s /usr/bin/python3 /usr/bin/python
83+
8184
RUN test -e /usr/local/cuda/lib64/libcublas.so || ln -s /usr/lib/x86_64-linux-gnu/libcublas.so /usr/local/cuda/lib64/libcublas.so
8285

8386
# RUN make -j ${CPU_CORES} onnxruntime

docker/Dockerfile_ubuntu_deps

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,9 @@ RUN cmake "${AV_DEV}" \
9393
RUN mkdir -p "${AV_INSTALL}/lib" && \
9494
ln -s lib "${AV_INSTALL}/lib64"
9595

96+
# Symlink to Python3 executable in case a call to "python" instead of "python3" is ever made
97+
RUN ln -s /usr/bin/python3 /usr/bin/python
98+
9699
RUN test -e /usr/local/cuda/lib64/libcublas.so || ln -s /usr/lib/x86_64-linux-gnu/libcublas.so /usr/local/cuda/lib64/libcublas.so
97100

98101
# RUN make -j ${CPU_CORES} lapack

docker/build-rocky.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ test -e docker/fetch.sh || {
66
exit 1
77
}
88

9-
test -z "$AV_DEPS_VERSION" && AV_DEPS_VERSION=2025.02.21
9+
test -z "$AV_DEPS_VERSION" && AV_DEPS_VERSION=2025.05.15
1010
test -z "$AV_VERSION" && AV_VERSION="$(git rev-parse --abbrev-ref HEAD)-$(git rev-parse --short HEAD)"
1111
test -z "$CUDA_VERSION" && CUDA_VERSION=12.1.1
1212
test -z "$ROCKY_VERSION" && ROCKY_VERSION=9

docker/build-ubuntu.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ test -e docker/fetch.sh || {
66
exit 1
77
}
88

9-
test -z "$AV_DEPS_VERSION" && AV_DEPS_VERSION=2025.02.21
9+
test -z "$AV_DEPS_VERSION" && AV_DEPS_VERSION=2025.05.15
1010
test -z "$AV_VERSION" && AV_VERSION="$(git rev-parse --abbrev-ref HEAD)-$(git rev-parse --short HEAD)"
1111
test -z "$CUDA_VERSION" && CUDA_VERSION=12.1.1
1212
test -z "$UBUNTU_VERSION" && UBUNTU_VERSION=22.04

0 commit comments

Comments
 (0)