diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-01-26 13:57:01 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-01-26 13:57:01 +0100 |
| commit | c268053839010c5abbef223498a71a5ecce8a632 (patch) | |
| tree | 2a252a41c9b465a1f0551619fa62883144f0488d | |
| parent | 32bae0ef24706e11d9b072b5d2c99f33c26cf050 (diff) | |
| download | vyos-build-c268053839010c5abbef223498a71a5ecce8a632.tar.gz vyos-build-c268053839010c5abbef223498a71a5ecce8a632.zip | |
Docker: evaluate OPAM environment during build time
| -rw-r--r-- | docker/Dockerfile | 3 | ||||
| -rwxr-xr-x | docker/entrypoint.sh | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index bdbc9fae..b874bf92 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -255,5 +255,8 @@ RUN export LATEST="$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packe RUN sed "s/^%sudo.*/%sudo\tALL=(ALL) NOPASSWD:ALL/g" -i /etc/sudoers && \ chmod a+s /usr/sbin/useradd /usr/sbin/groupadd /usr/sbin/gosu /usr/sbin/usermod +# Ensure sure all users have access to our OCAM installation +RUN echo "$(opam env --root=/opt/opam --set-root)" >> /etc/skel/.bashrc + COPY entrypoint.sh /usr/local/bin/entrypoint.sh ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index ed6ca7d9..8db41103 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -23,10 +23,6 @@ if ! grep -q $NEW_GID /etc/group; then groupadd --gid $NEW_GID $USER_NAME fi -# libvyosconfig depends on OCaml/OPAM so we make sure -# we can use it -echo "eval \$(opam env --root=/opt/opam --set-root)" >> /etc/skel/.bashrc - useradd --shell /bin/bash --uid $NEW_UID --gid $NEW_GID --non-unique --create-home $USER_NAME usermod --append --groups sudo $USER_NAME sudo chown $NEW_UID:$NEW_GID /home/$USER_NAME |