diff options
| -rw-r--r-- | docker/Dockerfile | 11 | ||||
| -rwxr-xr-x | docker/entrypoint.sh | 1 |
2 files changed, 10 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index d0592402..80e58b1a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -12,6 +12,7 @@ RUN echo "dash dash/sh boolean false" | debconf-set-selections && \ RUN apt-get update && apt-get install -y \ vim \ + nano \ git \ mc \ make \ @@ -25,7 +26,8 @@ RUN apt-get update && apt-get install -y \ sudo \ gosu \ graphviz \ - curl + curl \ + dos2unix RUN pip3 install sphinx-autobuild @@ -42,4 +44,11 @@ RUN sed "s/^%sudo.*/%sudo\tALL=(ALL) NOPASSWD:ALL/g" -i /etc/sudoers && \ RUN curl -sfL https://install.goreleaser.com/github.com/ValeLint/vale.sh | sh -s v1.7.1 COPY entrypoint.sh /usr/local/bin/entrypoint.sh + +# we need to convert the entrypoint with appropriate line endings, else +# there will be an error: +# standard_init_linux.go:175: exec user process caused +# "no such file or directory" +RUN dos2unix /usr/local/bin/entrypoint.sh + ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index d9cbc33c..8db41103 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -1,6 +1,5 @@ #!/bin/bash set -e -exec "$@" USER_NAME="vyos_bld" NEW_UID=$(stat -c "%u" .) |