diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-03-16 20:01:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-16 20:01:00 +0100 |
| commit | 6bf12667ed81c2fd7d6e840e89d9ac972b13ebc4 (patch) | |
| tree | c7e5a3fbf7d8ac0d2bbabdfe7d6b257ebb5e0357 | |
| parent | 0423450c3a4382508fe1512e94f498a99b9eff5b (diff) | |
| parent | a33a6d277007c2574c9fb6006eb0d20981e5fefe (diff) | |
| download | vyos-build-6bf12667ed81c2fd7d6e840e89d9ac972b13ebc4.tar.gz vyos-build-6bf12667ed81c2fd7d6e840e89d9ac972b13ebc4.zip | |
Merge pull request #928 from c-po/T5400-fix-schroedingers-env
Docker: T5400: do not initialize OPAM environment at all
| -rw-r--r-- | docker/Dockerfile | 7 | ||||
| -rwxr-xr-x | docker/entrypoint.sh | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index e1d7d0b1..a1553737 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (C) 2018-2024 VyOS maintainers and contributors +# Copyright (C) 2018-2025 VyOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # in order to easy exprort images built to "external" world @@ -367,9 +367,8 @@ RUN sed "s/^%sudo.*/%sudo\tALL=(ALL) NOPASSWD:ALL/g" -i /etc/sudoers && \ echo "vyos_bld\tALL=(ALL) NOPASSWD:ALL" >> /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 && \ - echo "export PATH=/opt/go/bin:\$PATH" >> /etc/skel/.bashrc +# Ensure sure all users have access to Go +RUN echo "export PATH=/opt/go/bin:\$PATH" >> /etc/skel/.bashrc # Rise upper limit for UID when working in an Active Direcotry integrated # environment. This solves the warning: vyos_bld's uid 1632000007 outside of the 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 |