chore(docker): Upgrade Conan to the latest 1.x version

Not upgrading to version 2, because it is not backwards compatible with version one. Signed-off-by: Frank Viernau <[email protected]>
oss-review-toolkit · Nov 13, 2023 · 5dd26aa · 5dd26aa
1 parent 9079062
commit 5dd26aa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.versions b/.versions
@@ -2,7 +2,7 @@ ANDROID_CMD_VERSION=9477386
 BOWER_VERSION=1.8.12
 COCOAPODS_VERSION=1.14.2
 COMPOSER_VERSION=2.2
-CONAN_VERSION=1.57.0
+CONAN_VERSION=1.61.0
 DART_VERSION=2.18.4
 DOTNET_VERSION=6.0
 GO_DEP_VERSION=0.5.4

diff --git a/Dockerfile b/Dockerfile
@@ -146,7 +146,7 @@ RUN curl -kSs https://pyenv.run | bash \
     && pyenv install -v $PYTHON_VERSION \
     && pyenv global $PYTHON_VERSION
 
-ARG CONAN_VERSION=1.57.0
+ARG CONAN_VERSION=1.61.0
 ARG PYTHON_INSPECTOR_VERSION=0.10.0
 ARG PYTHON_PIPENV_VERSION=2022.9.24
 ARG PYTHON_POETRY_VERSION=1.6.1

diff --git a/Dockerfile-legacy b/Dockerfile-legacy
@@ -71,7 +71,7 @@ ENV \
     CARGO_VERSION=0.67.1+ds0ubuntu0.libgit2-0ubuntu0.22.04.2 \
     COCOAPODS_VERSION=1.14.2 \
     COMPOSER_VERSION=2.2.6-2ubuntu4 \
-    CONAN_VERSION=1.57.0 \
+    CONAN_VERSION=1.61.0 \
     GO_DEP_VERSION=0.5.4 \
     GO_VERSION=1.21.1 \
     HASKELL_STACK_VERSION=2.13.1 \