diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-03-15 21:06:41 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2025-03-15 21:06:41 +0100 |
| commit | ab76eab0025cba5f98548d53faa8cb5cc948a17f (patch) | |
| tree | 230e01fe62c0207792072d15bec72c0572215cc4 /docker | |
| parent | b8f99c754702b094ace7fd632f3a035736a44fb4 (diff) | |
| download | vyos-build-ab76eab0025cba5f98548d53faa8cb5cc948a17f.tar.gz vyos-build-ab76eab0025cba5f98548d53faa8cb5cc948a17f.zip | |
Revert "Docker: T5400: ensure OPAM environment is always present"
This reverts commit b8f99c754702b094ace7fd632f3a035736a44fb4.
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | docker/entrypoint.sh | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index e1d7d0b1..ca70c5bf 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 "eval \$(opam env --root=/opt/opam --set-root)" >> /etc/skel/.bashrc && \ +RUN echo "$(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 4b4db3b6..19c9423e 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -24,8 +24,7 @@ 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 cp /etc/skel/.* /home/$USER_NAME -sudo chown -R $NEW_UID:$NEW_GID /home/$USER_NAME +sudo chown $NEW_UID:$NEW_GID /home/$USER_NAME export HOME=/home/$USER_NAME if [ "$(id -u)" == "0" ]; then |