Skip to content

Commit 0f2b3fe

Browse files
committed
GH-45381: [CI][Packaging][Conan] Use the latest supported image
Based on https://github.com/conan-io/conan-docker-tools/blob/master/images/README.md#official-docker-images, "gcc11-ubuntu16.04" is only supported image.
1 parent 3e6e8f3 commit 0f2b3fe

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,5 +101,5 @@ PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2025-01-27
101101
# Use conanio/${CONAN_BASE}:{CONAN_VERSION} for "docker compose run --rm conan".
102102
# See https://github.com/conan-io/conan-docker-tools#readme and
103103
# https://hub.docker.com/u/conanio for available images.
104-
CONAN_BASE=gcc10
105-
CONAN_VERSION=1.62.0
104+
CONAN_BASE=gcc11-ubuntu16.04
105+
CONAN_VERSION=2.12.1

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -742,8 +742,8 @@ services:
742742
# Usage:
743743
# docker compose run --rm conan
744744
# Parameters:
745-
# CONAN_BASE: gcc11, gcc11-armv7, ...
746-
# CONAN_VERSION: 1.62.0
745+
# CONAN_BASE: gcc11-ubuntu16.04, ...
746+
# CONAN_VERSION: 2.12.1, ...
747747
# See https://github.com/conan-io/conan-docker-tools#readme for
748748
# available images.
749749
image: conanio/${CONAN_BASE}:${CONAN_VERSION}

0 commit comments

Comments
 (0)