Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix image build and bump base image version #197

Merged
merged 5 commits into from
Nov 15, 2021
Merged

Fix image build and bump base image version #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
371dfff
fix: pin setuptools, pip, wheel and renku in renku virtualenv
Oct 25, 2021
98ab30c
fix: solve certificate problem by upgrading base image
Oct 25, 2021
771cc49
chore: pin setuptools also in user python env
Oct 26, 2021
ce4eb44
Fix renku install
TaoSunVoyage Nov 15, 2021
7e61ec6
Fix typo in base arg
TaoSunVoyage Nov 15, 2021
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
7 changes: 5 additions & 2 deletions docker/batch/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# define build arguments
ARG RENKU_BASE=renku/renkulab-py:latest
ARG BASE_IMAGE=python:3.9-slim-buster
ARG RENKU_VERSION=0.16.2

# define base images
FROM $RENKU_BASE as renku_base
Expand All @@ -20,11 +21,13 @@ RUN apt-get update -y && \
rm -rf /var/lib/apt/lists/*

# Install Renku python without pipx in a non-user location
ARG RENKU_VERSION
RUN python3 -m pip install --no-cache pipenv
RUN virtualenv /share/.renku && \
RUN virtualenv --pip 21.3.1 --setuptools 57.5.0 --wheel 0.36.2 --no-periodic-update /share/.renku && \
. /share/.renku/bin/activate && \
pip install --no-cache renku && \
pip install --no-cache renku==$RENKU_VERSION sentry-sdk && \
deactivate && \
mkdir /share/bin && \
ln -s /share/.renku/bin/renku /share/bin

ENV PATH /share/bin:$PATH
Expand Down
8 changes: 5 additions & 3 deletions docker/py/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Run with the RenkuKubeSpawner via JupyterHub
ARG BASE_IMAGE=jupyter/base-notebook:lab-3.0.16
ARG BASE_IMAGE=jupyter/base-notebook:lab-3.2.1
ARG RENKU_VERSION=0.16.2
FROM $BASE_IMAGE as base

LABEL maintainer="Swiss Data Science Center <[email protected]>"
Expand Down Expand Up @@ -61,10 +62,11 @@ ENV RENKU_DISABLE_VERSION_CHECK 1

ENV PATH=$PATH:$HOME/.renku/bin

ARG RENKU_VERSION
RUN mkdir -p $HOME/.renku/bin && \
virtualenv $HOME/.renku/venv && \
virtualenv --pip 21.3.1 --setuptools 57.5.0 --wheel 0.36.2 --no-periodic-update $HOME/.renku/venv && \
source $HOME/.renku/venv/bin/activate && \
pip install --no-cache renku sentry-sdk && \
pip install --no-cache renku==$RENKU_VERSION sentry-sdk && \
deactivate && \
ln -s $HOME/.renku/venv/bin/renku $HOME/.renku/bin/renku

Expand Down