-
Notifications
You must be signed in to change notification settings - Fork 355
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Update Debian base image to 12 * Add --break-system-packages option to pip3 install command * Remove chmod a+s from Dockerfile (newer versions of gosu in particular don't support this) * Add sudo to relevant commands in entrypoint.sh * Add UID_MIN key to adduser command (allows the container to run on MacOS) * Formatting and spelling fixes
- Loading branch information
1 parent
a2c9827
commit 48fc429
Showing
2 changed files
with
14 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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:11 | ||
FROM debian:12 | ||
LABEL authors="VyOS Maintainers <[email protected]>" | ||
|
||
ENV DEBIAN_FRONTEND noninteractive | ||
|
@@ -27,30 +27,26 @@ RUN apt-get update && apt-get install -y \ | |
curl \ | ||
dos2unix | ||
|
||
|
||
|
||
RUN pip3 install Sphinx | ||
RUN pip3 install sphinx-rtd-theme | ||
RUN pip3 install sphinx-autobuild | ||
RUN pip3 install sphinx-notfound-page | ||
RUN pip3 install lxml | ||
RUN pip3 install myst-parser | ||
RUN pip3 install sphinx_design | ||
|
||
RUN pip3 install --break-system-packages \ | ||
Sphinx \ | ||
sphinx-rtd-theme \ | ||
sphinx-autobuild \ | ||
sphinx-notfound-page \ | ||
lxml \ | ||
myst-parser \ | ||
sphinx_design | ||
|
||
# Cleanup | ||
RUN rm -rf /var/lib/apt/lists/* | ||
|
||
EXPOSE 8000 | ||
|
||
# Allow password-less 'sudo' for all users in group 'sudo' | ||
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 | ||
|
||
RUN sed "s/^%sudo.*/%sudo\tALL=(ALL) NOPASSWD:ALL/g" -i /etc/sudoers | ||
|
||
COPY entrypoint.sh /usr/local/bin/entrypoint.sh | ||
|
||
# we need to convert the entrypoint with appropriate line endings, else | ||
# 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" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters