Skip to content

Commit 79f5d20

Browse files
popescu-vThierry RAMORASOAVINA
authored andcommitted
Fix Debian and Ubuntu Docker images
- escape Conda channel label - use double equals sign in conda package version specification - drop conda-forge channel specification: conda uses conda-forge by default, because it is installed with miniforge.
1 parent 2105e7e commit 79f5d20

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

packaging/docker/khiopspydev/Dockerfile.debian

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ RUN true \
6060
export RC_LABEL=""; \
6161
fi; \
6262
# Update conda to the latest version \
63-
$CONDA update -n base -c conda-forge conda; \
63+
$CONDA update -n base conda; \
6464
for version in ${PYTHON_VERSIONS}; \
6565
do \
6666
CONDA_ENVS="py${version} py${version}_conda"; \
@@ -69,11 +69,11 @@ RUN true \
6969
$CONDA create -y -n $CONDA_ENV python=${version}; \
7070
done; \
7171
# khiops core \
72-
$CONDA install -y -n py${version}_conda ${RC_LABEL}khiops-core=$(echo ${KHIOPS_REVISION} | tr -d "-") ; \
72+
$CONDA install -y -n py${version}_conda "${RC_LABEL}"khiops-core==$(echo ${KHIOPS_REVISION} | tr -d "-") ; \
7373
# remote files drivers installed in the conda environment \
74-
$CONDA install -y -n py${version}_conda -c conda-forge \
75-
khiops-driver-s3=${KHIOPS_S3_DRIVER_REVISION} \
76-
khiops-driver-gcs=${KHIOPS_GCS_DRIVER_REVISION}; \
74+
$CONDA install -y -n py${version}_conda \
75+
khiops-driver-s3==${KHIOPS_S3_DRIVER_REVISION} \
76+
khiops-driver-gcs==${KHIOPS_GCS_DRIVER_REVISION}; \
7777
done' \
7878
&& true
7979

packaging/docker/khiopspydev/Dockerfile.ubuntu

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ RUN true \
5858
export RC_LABEL=""; \
5959
fi; \
6060
# Update conda to the latest version \
61-
$CONDA update -n base -c conda-forge conda; \
61+
$CONDA update -n base conda; \
6262
for version in ${PYTHON_VERSIONS}; \
6363
do \
6464
CONDA_ENVS="py${version} py${version}_conda"; \
@@ -67,11 +67,11 @@ RUN true \
6767
$CONDA create -y -n $CONDA_ENV python=${version}; \
6868
done; \
6969
# khiops core \
70-
$CONDA install -y -n py${version}_conda ${RC_LABEL}khiops-core=$(echo ${KHIOPS_REVISION} | tr -d "-") ; \
70+
$CONDA install -y -n py${version}_conda "${RC_LABEL}"khiops-core==$(echo ${KHIOPS_REVISION} | tr -d "-") ; \
7171
# remote files drivers installed in the conda environment \
72-
$CONDA install -y -n py${version}_conda -c conda-forge \
73-
khiops-driver-s3=${KHIOPS_S3_DRIVER_REVISION} \
74-
khiops-driver-gcs=${KHIOPS_GCS_DRIVER_REVISION}; \
72+
$CONDA install -y -n py${version}_conda \
73+
khiops-driver-s3==${KHIOPS_S3_DRIVER_REVISION} \
74+
khiops-driver-gcs==${KHIOPS_GCS_DRIVER_REVISION}; \
7575
done' \
7676
&& true
7777

0 commit comments

Comments
 (0)