From b02b7d88320ffa84336b891c64cca8dd47424c87 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 21 May 2024 18:36:12 +0200 Subject: [PATCH 1/2] fix_broken_dockerfile initial --- docker/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index cc0701d8d81..df570c2de7e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -230,8 +230,9 @@ FROM run-time-dependencies as sagemath ARG HOME=/home/sage ARG SAGE_ROOT=/home/sage/sage COPY --chown=sage:sage --from=make-release $SAGE_ROOT/ $SAGE_ROOT/ -# Put scripts to start gap, gp, maxima, ... in /usr/bin -RUN sudo $SAGE_ROOT/sage --nodotsage -c "install_scripts('/usr/bin')" +# set path to start gap, gp, maxima, ... bashrc +RUN echo "export PATH=$SAGE_ROOT/local/bin:$PATH" >> ~/.bashrc + COPY ./docker/entrypoint.sh /usr/local/bin/sage-entrypoint WORKDIR $HOME ENTRYPOINT ["/usr/local/bin/sage-entrypoint"] From c1407f9f0f87af26f0964012689785585acf7f6f Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 22 May 2024 08:18:29 +0200 Subject: [PATCH 2/2] 38049: improve comment --- docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index df570c2de7e..a74b451bc3b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -230,7 +230,8 @@ FROM run-time-dependencies as sagemath ARG HOME=/home/sage ARG SAGE_ROOT=/home/sage/sage COPY --chown=sage:sage --from=make-release $SAGE_ROOT/ $SAGE_ROOT/ -# set path to start gap, gp, maxima, ... bashrc +# set path in bashrc to start gap, gp, maxima, ... this does not +# affect Sage (see https://github.com/sagemath/sage/pull/38049) RUN echo "export PATH=$SAGE_ROOT/local/bin:$PATH" >> ~/.bashrc COPY ./docker/entrypoint.sh /usr/local/bin/sage-entrypoint