Skip to content

Commit 18effc2

Browse files
authored
Revert "Put a workaround to fetch the 0.0.14 version of the s3 driver from github" (#505)
This reverts commit 22a553a.
1 parent 6cc07ac commit 18effc2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

packaging/docker/khiopspydev/Dockerfile.rocky

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ ARG KHIOPS_REVISION
1414
RUN true \
1515
&& useradd -rm -d /home/rocky -s /bin/bash -g root -u 1000 rocky \
1616
# Install git (for khiops-python version calculation), pandoc and pip \
17-
&& dnf upgrade -y \
17+
# --allowerasing is needed to resolve package conflicts \
18+
&& dnf upgrade -y --allowerasing \
1819
&& dnf search pandoc \
1920
&& dnf install --enablerepo=devel -y \
2021
git \

packaging/docker/khiopspydev/Dockerfile.ubuntu

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ RUN true \
8383
# Get Linux distribution codename \
8484
&& if [ -f /etc/os-release ]; then . /etc/os-release; fi \
8585
&& wget -O khiops-gcs.deb https://github.com/KhiopsML/khiopsdriver-gcs/releases/download/${KHIOPS_GCS_DRIVER_REVISION}/khiops-driver-gcs_${KHIOPS_GCS_DRIVER_REVISION}-1-${VERSION_CODENAME}.amd64.deb \
86-
# A little typo in the artifact name for version 0.0.14 needs fixing that is why a hardcoded version is used here \
87-
&& wget -O khiops-s3.deb https://github.com/KhiopsML/khiopsdriver-s3/releases/download/${KHIOPS_S3_DRIVER_REVISION}/khiops-driver-s3_0.0.13-1-${VERSION_CODENAME}.amd64.deb \
86+
&& wget -O khiops-s3.deb https://github.com/KhiopsML/khiopsdriver-s3/releases/download/${KHIOPS_S3_DRIVER_REVISION}/khiops-driver-s3_${KHIOPS_S3_DRIVER_REVISION}-1-${VERSION_CODENAME}.amd64.deb \
8887
&& (dpkg -i --force-all khiops-gcs.deb khiops-s3.deb || true) \
8988
&& apt-get -f -y install \
9089
&& rm -f khiops-gcs.deb khiops-s3.deb \

0 commit comments

Comments
 (0)