Skip to content

Commit

Permalink
Undo unintended changes
Browse files Browse the repository at this point in the history
Co-authored-by: Sebastian Oehms <47305845+soehms@users.noreply.github.com>
  • Loading branch information
Matthias Köppe and soehms authored Jun 21, 2024
1 parent 3c1de04 commit b61a9f4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .ci/write-dockerfile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ case $SYSTEM in
*)
#
# The Ubuntu Docker images are "minimized", meaning that some large
# bits such AS documentation has been removed. We have to unminimize
# bits such as documentation has been removed. We have to unminimize
# once (which reinstalls the full versions of some minimized packages),
# or e.g. the maxima documentation (which we depend on for correct operation)
# will be missing.
Expand Down
8 changes: 4 additions & 4 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,13 @@ RUN apt-get -qq update \
&& apt-get -qq install -y --no-install-recommends gfortran gcc g++ libstdc++-10-dev sudo openssl \
&& apt-get -qq clean \
&& rm -r /var/lib/apt/lists/*
# Sage refuses to build AS root, so we add a "sage" user that can sudo without a password.
# We also want this user at runtime AS some commands in sage know about the user that was used during build.
# Sage refuses to build as root, so we add a "sage" user that can sudo without a password.
# We also want this user at runtime as some commands in sage know about the user that was used during build.
ARG HOME=/home/sage
RUN adduser --quiet --shell /bin/bash --gecos "Sage user,101,," --disabled-password --home "$HOME" sage \
&& echo "sage ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/01-sage \
&& chmod 0440 /etc/sudoers.d/01-sage
# Run everything from now on AS the sage user in sage's home
# Run everything from now on as the sage user in sage's home
USER sage
ENV HOME $HOME
WORKDIR $HOME
Expand Down Expand Up @@ -283,7 +283,7 @@ ARG SAGE_ROOT=/home/sage/sage
# ARTIFACT_BASE to the image size. As of mid 2018 this is notably the case with
# the docker instances provided by setup_remote_docker on CircleCI. As a
# result, the sagemath-dev images that are "build-from-latest" are twice AS big
# AS the ones that are build on GitLab:
# as the ones that are build on GitLab:
# https://github.com/moby/moby/issues/6119#issuecomment-268870519
COPY --chown=sage:sage --from=sagemath-dev-patch $SAGE_ROOT $SAGE_ROOT
ARG ARTIFACT_BASE=source-clean
Expand Down

0 comments on commit b61a9f4

Please sign in to comment.