From c784c7c805e9759fee13acbb3b9ef5a8cc584ed4 Mon Sep 17 00:00:00 2001 From: Remy Derollez Date: Thu, 4 Feb 2021 23:25:53 -0800 Subject: [PATCH 1/2] fix: moved comment line in Makefile to fix build-documentation target --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index af2bb121..ead92dd9 100644 --- a/Makefile +++ b/Makefile @@ -202,9 +202,9 @@ build-release-image-jupyter: pull-release-image-jupyter --build-arg="JUPYTER_NOTEBOOK_IMAGE_REPOSITORY=$(jupyter_notebook_image_repository)" \ "$(project_directory)/docker/jupyter" -build-documentation: target := debian ## Build documentation +build-documentation: target := debian -build-documentation: _build-development-image +build-documentation: _build-development-image ## Build documentation @ echo "Building [$(target)] documentation..." From 1200a649ff04614c2b8eb28eb14ce46c98b0d49d Mon Sep 17 00:00:00 2001 From: Remy Derollez Date: Thu, 4 Feb 2021 23:26:59 -0800 Subject: [PATCH 2/2] build: fixed python and pip install+versions in fedora release image --- docker/release/fedora/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/release/fedora/Dockerfile b/docker/release/fedora/Dockerfile index d11fd2a3..955e2a46 100644 --- a/docker/release/fedora/Dockerfile +++ b/docker/release/fedora/Dockerfile @@ -51,7 +51,8 @@ FROM fedora:32 as python-builder COPY --from=cpp-builder /app/build/bindings/python/dist /dist -RUN python3.8 -m pip install /dist/*38*.whl +RUN python3.8 -m ensurepip --default-pip \ + && python3.8 -m pip install /dist/*38*.whl ################################################################################################################################################################ @@ -61,7 +62,8 @@ LABEL maintainer="lucas@loftorbital.com" RUN ln -s /usr/bin/pip3 /usr/bin/pip -RUN pip install ipython +RUN python3.8 -m ensurepip --default-pip \ + && python3.8 -m pip install ipython COPY --from=python-builder /usr/local/lib/python3.8/site-packages/ostk /usr/local/lib/python3.8/site-packages/ostk