Skip to content

Commit

Permalink
GH-45381: [CI][Packaging][Conan] Use the latest supported image
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed Jan 30, 2025
1 parent 3e6e8f3 commit 0f2b3fe
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -101,5 +101,5 @@ PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2025-01-27
# Use conanio/${CONAN_BASE}:{CONAN_VERSION} for "docker compose run --rm conan".
# See https://github.com/conan-io/conan-docker-tools#readme and
# https://hub.docker.com/u/conanio for available images.
CONAN_BASE=gcc10
CONAN_VERSION=1.62.0
CONAN_BASE=gcc11-ubuntu16.04
CONAN_VERSION=2.12.1
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -742,8 +742,8 @@ services:
# Usage:
# docker compose run --rm conan
# Parameters:
# CONAN_BASE: gcc11, gcc11-armv7, ...
# CONAN_VERSION: 1.62.0
# CONAN_BASE: gcc11-ubuntu16.04, ...
# CONAN_VERSION: 2.12.1, ...
# See https://github.com/conan-io/conan-docker-tools#readme for
# available images.
image: conanio/${CONAN_BASE}:${CONAN_VERSION}
Expand Down

0 comments on commit 0f2b3fe

Please sign in to comment.