diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-01-22 19:55:45 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-01-22 19:55:45 +0100 |
| commit | 87d7dc9773f214d36a20b5621a0c08eacde297e0 (patch) | |
| tree | 3b148d0c4bce71053bb37e17e97fc215843b7597 | |
| parent | 1b55c12d22e282a805a5d35567dc35f5987beb1f (diff) | |
| download | vyos-documentation-87d7dc9773f214d36a20b5621a0c08eacde297e0.tar.gz vyos-documentation-87d7dc9773f214d36a20b5621a0c08eacde297e0.zip | |
Docker: sync to 'master' branch
| -rw-r--r-- | docker/Dockerfile | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 89f77125..5e3095d7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,7 @@ # Must be run with --privileged flag # Recommended to run the container with a volume mapped # in order to easy exprort images built to "external" world -FROM debian:stretch +FROM debian:buster LABEL authors="VyOS Maintainers <maintainers@vyos.io>" ENV DEBIAN_FRONTEND noninteractive @@ -12,20 +12,25 @@ RUN echo "dash dash/sh boolean false" | debconf-set-selections && \ RUN apt-get update && apt-get install -y \ vim \ + nano \ git \ mc \ make \ - python3-sphinx \ python3-pip \ - python-sphinx-rtd-theme \ latexmk \ texlive-latex-recommended \ texlive-fonts-recommended \ texlive-latex-extra \ sudo \ gosu \ - curl + graphviz \ + curl \ + dos2unix + + +RUN pip3 install Sphinx +RUN pip3 install sphinx-rtd-theme RUN pip3 install sphinx-autobuild # Cleanup @@ -40,8 +45,12 @@ RUN sed "s/^%sudo.*/%sudo\tALL=(ALL) NOPASSWD:ALL/g" -i /etc/sudoers && \ # vale 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 -COPY entrypoint.sh /usr/local/bin/entrypoint.sh ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] - |