diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-03-07 14:15:40 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2025-03-07 14:15:40 +0100 |
| commit | b8f99c754702b094ace7fd632f3a035736a44fb4 (patch) | |
| tree | 57452dece783d8a924aa843656d4ea5d49c5faca | |
| parent | f23b204e681e00d13ec3c33436247422849e6803 (diff) | |
| download | vyos-build-b8f99c754702b094ace7fd632f3a035736a44fb4.tar.gz vyos-build-b8f99c754702b094ace7fd632f3a035736a44fb4.zip | |
Docker: T5400: ensure OPAM environment is always present
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | docker/entrypoint.sh | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index ca70c5bf..e1d7d0b1 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -368,7 +368,7 @@ RUN sed "s/^%sudo.*/%sudo\tALL=(ALL) NOPASSWD:ALL/g" -i /etc/sudoers && \ chmod a+s /usr/sbin/useradd /usr/sbin/groupadd # Ensure sure all users have access to our OCAM and Go installation -RUN echo "$(opam env --root=/opt/opam --set-root)" >> /etc/skel/.bashrc && \ +RUN echo "eval \$(opam env --root=/opt/opam --set-root)" >> /etc/skel/.bashrc && \ echo "export PATH=/opt/go/bin:\$PATH" >> /etc/skel/.bashrc # Rise upper limit for UID when working in an Active Direcotry integrated diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 19c9423e..4b4db3b6 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -24,7 +24,8 @@ if ! grep -q $NEW_GID /etc/group; then fi useradd --shell /bin/bash --uid $NEW_UID --gid $NEW_GID --non-unique --create-home $USER_NAME -sudo chown $NEW_UID:$NEW_GID /home/$USER_NAME +sudo cp /etc/skel/.* /home/$USER_NAME +sudo chown -R $NEW_UID:$NEW_GID /home/$USER_NAME export HOME=/home/$USER_NAME if [ "$(id -u)" == "0" ]; then |