Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docker: Multiple fixes #1392

Merged
merged 3 commits into from
May 10, 2024
Merged

docker: Multiple fixes #1392

merged 3 commits into from
May 10, 2024

Conversation

MattKobayashi
Copy link
Contributor

@MattKobayashi MattKobayashi commented Apr 18, 2024

Change Summary

  • 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

Related Task(s)

Related PR(s)

Backport

  • sagitta
  • equuleus

Checklist:

Copy link
Member

@rebortg rebortg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you test the build and usage? I Build this on Mac but got an error when i want to build the docu:

docker run --rm -it -v "$(pwd)":/vyos -w /vyos/docs \
  -e GOSU_UID=$(id -u) -e GOSU_GID=$(id -g) vyos-docsv2 make html
Current UID/GID: 501/20
sudo: exec: command not found

@MattKobayashi
Copy link
Contributor Author

@rebortg I did test it at the time, but for some reason it isn't working now. I've added another commit to fix the issue, tested working on macOS 14.4.1.

@c-po
Copy link
Member

c-po commented May 9, 2024

@MattKobayashi can you please add a comment why --key UID_MIN=500 the min UID needs to be 500? Maybe a MacOS thing?

@MattKobayashi
Copy link
Contributor Author

@c-po That's correct, macOS UIDs begin at 501. This is actually part of the Linux Standard Base specification.

docker/entrypoint.sh Outdated Show resolved Hide resolved
@c-po c-po merged commit 48fc429 into vyos:current May 10, 2024
4 checks passed
@c-po
Copy link
Member

c-po commented May 10, 2024

@Mergifyio backport sagitta

Copy link

mergify bot commented May 10, 2024

backport sagitta

✅ Backports have been created

@mergify mergify bot mentioned this pull request May 10, 2024
1 task
c-po added a commit that referenced this pull request May 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants