Skip to content

Add aws-user and github-user to CI docker images, drop --user root #6356

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.

Sign up for GitHub

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

Merged
Fedr merged 2 commits into from
Jul 2, 2026
Merged

Add aws-user and github-user to CI docker images, drop --user root #6356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0d1e1d
add aws-user and github-user to docker images, drop --user root from …
Fedr Jul 2, 2026
83f6695
drop container-options matrix plumbing entirely
Fedr Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/build-test-linux-vcpkg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ jobs:
runs-on: ${{ matrix.os }}
container:
image: meshlib/meshlib-rockylinux8-vcpkg-${{ matrix.arch }}:${{ inputs.docker_image_tag }}
options: --user root
strategy:
fail-fast: false
matrix:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build-test-ubuntu-arm64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ jobs:
runs-on: ubuntu-24.04-arm
container:
image: meshlib/meshlib-${{matrix.os}}-arm64:${{inputs.docker_image_tag}}
options: --user root
strategy:
fail-fast: false
matrix:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build-test-ubuntu-x64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ jobs:
runs-on: [ubuntu-latest]
container:
image: meshlib/meshlib-${{matrix.os}}:${{inputs.docker_image_tag}}
options: --user root
strategy:
fail-fast: false
matrix: ${{ fromJSON( inputs.config_matrix ) }}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/generate-c-bindings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
contents: read # This is required for actions/checkout
container:
image: meshlib/meshlib-emscripten-generate-c-bindings-arm64:${{inputs.docker_image_tag}}
options: --user root

steps:
- name: Checkout
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/pip-build.yml
View file
Open in desktop

@Grantim Grantim Jul 2, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

same

Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,11 @@ jobs:
- extend:
- platform: x86_64
os: rockylinux8-vcpkg-x64
container-options: "--user root"
runner: ubuntu-latest
compiler: /usr/bin/clang++
container-prefix: ""
- platform: aarch64
os: rockylinux8-vcpkg-arm64
container-options: " "
runner: ubuntu-24.04-arm
compiler: /usr/bin/clang++
container-prefix: arm64v8/
Expand Down Expand Up @@ -112,12 +110,10 @@ jobs:
rules: |
- extend:
- platform: x86_64
container-options: "--user root"
runner: ubuntu-latest
compiler: /usr/bin/clang++
container-prefix: ""
- platform: aarch64
container-options: " "
runner: ubuntu-24.04-arm
compiler: /usr/bin/clang++
container-prefix: arm64v8/
Expand Down Expand Up @@ -159,7 +155,6 @@ jobs:
runs-on: ${{ matrix.runner }}
container:
image: meshlib/meshlib-${{ matrix.os }}:${{ inputs.vcpkg_docker_image_tag || 'latest' }}
options: ${{ matrix.container-options }}
strategy:
fail-fast: false
# `include` enumerates the per-platform combos, surviving platforms
Expand Down Expand Up @@ -584,7 +579,6 @@ jobs:
runs-on: ${{ matrix.runner }}
container:
image: ${{ matrix.container-prefix }}${{ matrix.os }}
options: ${{ matrix.container-options }}
strategy:
fail-fast: false
# `include` is the cartesian product (surviving platforms x
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/release-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ jobs:
runs-on: ${{ matrix.runner }}
container:
image: ${{matrix.container-prefix}}${{matrix.os}}
options: ${{ matrix.container-options }}
strategy:
fail-fast: false
matrix:
Expand All @@ -32,11 +31,9 @@ jobs:
include:
- platform: "x86_64"
runner: ubuntu-latest
container-options: "--user root"
container-prefix: ""
- platform: "aarch64"
runner: ubuntu-24.04-arm
container-options: " " # empty
container-prefix: "arm64v8/"
- os: "ubuntu:20.04"
py-version: "3.8"
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/update-docs-manual.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ jobs:
runs-on: ubuntu-24.04-arm
container:
image: meshlib/meshlib-ubuntu22-arm64:latest
options: --user root
strategy:
fail-fast: false
env:
Expand Down
14 changes: 4 additions & 10 deletions docker/emscripten-build-c-bindingsDockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,8 @@ FROM base
COPY --from=builder /opt/meshlib-thirdparty/emscripten /usr/local/lib/emscripten
COPY --from=builder /opt/meshlib-thirdparty/emscripten-single /usr/local/lib/emscripten-single

# Setup non-root user (use 1001 to play nicely with actions/checkout@v4)
# https://github.com/actions/checkout/issues/1014
RUN <<EOF
set -e
groupadd -g 1001 user
useradd -m -u 1001 -g user -s /bin/bash user
chmod -R 777 /emsdk/upstream/emscripten/
EOF
RUN chmod -R 777 /emsdk/upstream/emscripten/

# Change to non-root privilege
USER user
RUN useradd -u 8877 -m aws-user
RUN useradd -u 1001 -m github-user
USER github-user
4 changes: 4 additions & 0 deletions docker/emscripten-generate-c-bindingsDockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,7 @@ RUN <<EOF
apt-get clean
rm -rf /var/lib/apt/lists/*
EOF

RUN useradd -u 8877 -m aws-user
RUN useradd -u 1001 -m github-user
USER github-user
14 changes: 4 additions & 10 deletions docker/emscriptenDockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,8 @@ COPY --from=builder /opt/meshlib-thirdparty/emscripten /usr/local/lib/ems
COPY --from=builder /opt/meshlib-thirdparty/emscripten-single /usr/local/lib/emscripten-single
COPY --from=builder /opt/meshlib-thirdparty/emscripten-wasm64 /usr/local/lib/emscripten-wasm64

# Setup non-root user (use 1001 to play nicely with actions/checkout@v4)
# https://github.com/actions/checkout/issues/1014
RUN <<EOF
set -e
groupadd -g 1001 user
useradd -m -u 1001 -g user -s /bin/bash user
chmod -R 777 /emsdk/upstream/emscripten/
EOF
RUN chmod -R 777 /emsdk/upstream/emscripten/

# Change to non-root privilege
USER user
RUN useradd -u 8877 -m aws-user
RUN useradd -u 1001 -m github-user
USER github-user
4 changes: 4 additions & 0 deletions docker/rockylinux8-vcpkgDockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,7 @@ ENV VCPKG_INSTALLED_DIR=/opt/vcpkg_installed

ARG VCPKG_TRIPLET
ENV VCPKG_TRIPLET=$VCPKG_TRIPLET

RUN useradd -u 8877 -m aws-user
RUN useradd -u 1001 -m github-user
USER github-user
4 changes: 4 additions & 0 deletions docker/rockylinux9-vcpkgDockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,7 @@ ENV VCPKG_ROOT=/opt/vcpkg

ARG VCPKG_TRIPLET
ENV VCPKG_TRIPLET=$VCPKG_TRIPLET

RUN useradd -u 8877 -m aws-user
RUN useradd -u 1001 -m github-user
USER github-user
8 changes: 3 additions & 5 deletions docker/ubuntu22Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,6 @@ RUN <<EOF
ldconfig
EOF

# Add a new user "actions-runner" with user id 8877
RUN useradd -u 8877 -m user

# Change to non-root privilege
USER user
RUN useradd -u 8877 -m aws-user
RUN useradd -u 1001 -m github-user
USER github-user
8 changes: 3 additions & 5 deletions docker/ubuntu24Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@ RUN <<EOF
ldconfig
EOF

# Add a new user "actions-runner" with user id 8877
RUN useradd -u 8877 -m user

# Change to non-root privilege
USER user
RUN useradd -u 8877 -m aws-user
RUN useradd -u 1001 -m github-user
USER github-user
Loading