Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packaging/docker/khiopspydev/Dockerfile.rocky
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ ARG KHIOPS_REVISION
RUN true \
&& useradd -rm -d /home/rocky -s /bin/bash -g root -u 1000 rocky \
# Install git (for khiops-python version calculation), pandoc and pip \
&& dnf upgrade -y \
# --allowerasing is needed to resolve package conflicts \
&& dnf upgrade -y --allowerasing \
&& dnf search pandoc \
&& dnf install --enablerepo=devel -y \
git \
Expand Down
3 changes: 1 addition & 2 deletions packaging/docker/khiopspydev/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@ RUN true \
# Get Linux distribution codename \
&& if [ -f /etc/os-release ]; then . /etc/os-release; fi \
&& 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 \
# A little typo in the artifact name for version 0.0.14 needs fixing that is why a hardcoded version is used here \
&& 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 \
&& 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 \
&& (dpkg -i --force-all khiops-gcs.deb khiops-s3.deb || true) \
&& apt-get -f -y install \
&& rm -f khiops-gcs.deb khiops-s3.deb \
Expand Down