From c31ba08eb12ac74d9728dc39a0b60117596b8417 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Tue, 1 Oct 2024 11:23:17 +0200 Subject: [PATCH] feat!: switch default userid to `12021` (#3351) - closes #3277 BREAKING CHANGE: the default user id is now `12021`. --- docs/custom-base-image.md | 4 ++-- src/cli/services/env.service.spec.ts | 4 ++-- src/cli/services/env.service.ts | 2 +- .../bin/install-containerbase.sh | 2 +- test/bash/filesystem.bats | 6 +++--- test/bash/util.sh | 2 +- test/bash/v2/filesystem.bats | 2 +- test/dart/Dockerfile | 4 ++-- test/dotnet/Dockerfile | 6 +++--- test/erlang/Dockerfile | 6 +++--- test/flutter/Dockerfile | 6 +++--- test/flux/Dockerfile | 2 +- test/golang/Dockerfile | 10 +++++----- test/helm/Dockerfile | 4 ++-- test/java/Dockerfile | 8 ++++---- test/jb/Dockerfile | 4 ++-- test/latest/Dockerfile | 4 ++-- test/nix/Dockerfile | 10 +++++----- test/node/Dockerfile | 20 +++++++++---------- test/php/Dockerfile | 6 +++--- test/powershell/Dockerfile | 4 ++-- test/python/Dockerfile | 10 +++++----- test/ruby/Dockerfile | 14 ++++++------- test/rust/Dockerfile | 6 +++--- test/swift/Dockerfile | 6 +++--- 25 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docs/custom-base-image.md b/docs/custom-base-image.md index bd5d90281..36787a9f3 100644 --- a/docs/custom-base-image.md +++ b/docs/custom-base-image.md @@ -9,7 +9,7 @@ You should always use a specific version which can be found at [docker hub](http ## Default user name and id -Use this template for using a custom base image with our default user named `ubuntu` and userid `1000`. +Use this template for using a custom base image with our default user named `ubuntu` and userid `12021`. ```dockerfile # This containerbase is used for tool intallation and user/directory setup @@ -47,7 +47,7 @@ RUN install-tool yarn 1.22.10 WORKDIR /usr/src/app # must be numeric if this should work with openshift -USER 1000 +USER 12021 ``` ## Custom user name and id diff --git a/src/cli/services/env.service.spec.ts b/src/cli/services/env.service.spec.ts index b40df912f..4e54b845c 100644 --- a/src/cli/services/env.service.spec.ts +++ b/src/cli/services/env.service.spec.ts @@ -58,13 +58,13 @@ describe('env.service', () => { }); test('userId', () => { - expect(child.get(EnvService).userId).toBe(1000); + expect(child.get(EnvService).userId).toBe(12021); }); test('umask', () => { const e = child.get(EnvService); expect(e.umask).toBe(0o755); - Object.assign(e, { uid: 1000 }); + Object.assign(e, { uid: 12021 }); expect(e.umask).toBe(0o775); }); diff --git a/src/cli/services/env.service.ts b/src/cli/services/env.service.ts index d6b8207ba..471608f62 100644 --- a/src/cli/services/env.service.ts +++ b/src/cli/services/env.service.ts @@ -77,7 +77,7 @@ export class EnvService { } get userId(): number { - return parseInt(env.USER_ID ?? '1000', 10); + return parseInt(env.USER_ID ?? '12021', 10); } get umask(): number { diff --git a/src/usr/local/containerbase/bin/install-containerbase.sh b/src/usr/local/containerbase/bin/install-containerbase.sh index fb6f81fd4..f1732f639 100755 --- a/src/usr/local/containerbase/bin/install-containerbase.sh +++ b/src/usr/local/containerbase/bin/install-containerbase.sh @@ -10,7 +10,7 @@ if [[ -z "${USER_NAME}" ]]; then fi if [[ -z "${USER_ID}" ]]; then - export USER_ID=1000 + export USER_ID=12021 echo "No USER_ID defined - using: ${USER_ID}" fi diff --git a/test/bash/filesystem.bats b/test/bash/filesystem.bats index 7d9761cc4..5d137ad71 100644 --- a/test/bash/filesystem.bats +++ b/test/bash/filesystem.bats @@ -18,7 +18,7 @@ teardown() { } @test "gets the default install dir" { - TEST_ROOT_USER=1000 \ + TEST_ROOT_USER=12021 \ run get_install_dir assert_output "${TEST_ROOT_DIR}/user" @@ -142,7 +142,7 @@ teardown() { run create_folder assert_failure - TEST_ROOT_USER=1000 + TEST_ROOT_USER=12021 run create_folder "${install_dir}/foo" assert_success @@ -172,7 +172,7 @@ teardown() { @test "creates deep folder with correct permissions" { local install_dir=$(get_install_dir) - TEST_ROOT_USER=1000 + TEST_ROOT_USER=12021 run create_folder "${install_dir}/test/foo/bar/baz" assert [ -d "${install_dir}/test" ] diff --git a/test/bash/util.sh b/test/bash/util.sh index a7e1de60e..a0f3ab3e8 100644 --- a/test/bash/util.sh +++ b/test/bash/util.sh @@ -12,7 +12,7 @@ export USER_HOME="${TEST_ROOT_DIR}/user" export ENV_FILE="${TEST_ROOT_DIR}/env" # set default test user -export TEST_ROOT_USER=1000 +export TEST_ROOT_USER=12021 # Overwrite is_root function to check a test root user # instead of the effective caller diff --git a/test/bash/v2/filesystem.bats b/test/bash/v2/filesystem.bats index 18198902a..8b7c6236b 100644 --- a/test/bash/v2/filesystem.bats +++ b/test/bash/v2/filesystem.bats @@ -21,7 +21,7 @@ teardown() { } @test "overwrite: gets the default install dir" { - TEST_ROOT_USER=1000 \ + TEST_ROOT_USER=12021 \ run get_install_dir assert_output "${TEST_ROOT_DIR}/root" diff --git a/test/dart/Dockerfile b/test/dart/Dockerfile index 00f492ab0..af89c6b5b 100644 --- a/test/dart/Dockerfile +++ b/test/dart/Dockerfile @@ -31,7 +31,7 @@ ARG CONTAINERBASE_CDN ARG CONTAINERBASE_DEBUG ARG CONTAINERBASE_LOG_LEVEL -COPY --chown=1000:0 test/dart/test test +COPY --chown=12021:0 test/dart/test test WORKDIR /test #-------------------------------------- @@ -46,7 +46,7 @@ RUN prepare-tool dart #-------------------------------------- FROM build AS testa -USER 1000 +USER 12021 RUN install-tool dart 2.0.0 diff --git a/test/dotnet/Dockerfile b/test/dotnet/Dockerfile index 906794f5b..20f02b2f3 100644 --- a/test/dotnet/Dockerfile +++ b/test/dotnet/Dockerfile @@ -31,7 +31,7 @@ ARG CONTAINERBASE_CDN ARG CONTAINERBASE_DEBUG ARG CONTAINERBASE_LOG_LEVEL -COPY --chown=1000:0 test/dotnet/test test +COPY --chown=12021:0 test/dotnet/test test WORKDIR /test #-------------------------------------- @@ -44,7 +44,7 @@ RUN set -ex; dotnet --version | grep 6.0. RUN ls -la $USER_HOME/.nuget/NuGet -USER 1000 +USER 12021 RUN dotnet --info @@ -80,7 +80,7 @@ RUN install-tool dotnet 8.0.402 RUN install-tool dotnet 8.0.402 RUN set -ex; dotnet --version | grep 8.0. -USER 1000 +USER 12021 RUN dotnet --info diff --git a/test/erlang/Dockerfile b/test/erlang/Dockerfile index 77eb84142..02bacb9ee 100644 --- a/test/erlang/Dockerfile +++ b/test/erlang/Dockerfile @@ -31,7 +31,7 @@ ARG CONTAINERBASE_CDN ARG CONTAINERBASE_DEBUG ARG CONTAINERBASE_LOG_LEVEL -# test openshift compatibility 1000<>1001 +# test openshift compatibility 12021<>1001 COPY --chown=1001:0 test/erlang/test test WORKDIR /test @@ -54,8 +54,8 @@ RUN install-tool erlang 27.0.1.0 # renovate: datasource=github-releases packageName=elixir-lang/elixir RUN install-tool elixir 1.17.3 -RUN chown -R 1000:0 /test -USER 1000 +RUN chown -R 12021:0 /test +USER 12021 RUN set -ex; \ cd a; \ diff --git a/test/flutter/Dockerfile b/test/flutter/Dockerfile index 8e0fdd2cd..48e0be4c5 100644 --- a/test/flutter/Dockerfile +++ b/test/flutter/Dockerfile @@ -35,7 +35,7 @@ ARG CONTAINERBASE_CDN ARG CONTAINERBASE_DEBUG ARG CONTAINERBASE_LOG_LEVEL -COPY --chown=1000:0 test/flutter/test test +COPY --chown=12021:0 test/flutter/test test WORKDIR /test #-------------------------------------- @@ -50,7 +50,7 @@ RUN prepare-tool flutter #-------------------------------------- FROM build AS testa -USER 1000 +USER 12021 # EOL RUN install-tool flutter 2.10.5 @@ -64,7 +64,7 @@ RUN set -ex; \ #-------------------------------------- FROM build AS testb -USER 1000 +USER 12021 # renovate: datasource=github-releases packageName=containerbase/flutter-prebuild RUN install-tool flutter 3.24.3 diff --git a/test/flux/Dockerfile b/test/flux/Dockerfile index 14eb2eccb..2574d6793 100644 --- a/test/flux/Dockerfile +++ b/test/flux/Dockerfile @@ -34,7 +34,7 @@ ARG CONTAINERBASE_LOG_LEVEL # renovate: datasource=github-releases depName=flux packageName=fluxcd/flux2 ARG FLUX_VERSION=v2.3.0 -USER 1000 +USER 12021 #-------------------------------------- # install flux as root diff --git a/test/golang/Dockerfile b/test/golang/Dockerfile index b6d1e6ca6..0b57da83a 100644 --- a/test/golang/Dockerfile +++ b/test/golang/Dockerfile @@ -35,7 +35,7 @@ ARG CONTAINERBASE_CDN ARG CONTAINERBASE_DEBUG ARG CONTAINERBASE_LOG_LEVEL -COPY --chown=1000:0 test/golang/test test +COPY --chown=12021:0 test/golang/test test WORKDIR /test #-------------------------------------- @@ -46,7 +46,7 @@ FROM base AS testa # renovate: datasource=github-releases packageName=containerbase/golang-prebuild RUN install-tool golang 1.23.1 -USER 1000 +USER 12021 RUN set -ex; cd a; go get -d ./...; cat go.sum; go mod tidy; cat go.sum @@ -60,7 +60,7 @@ RUN set -ex; \ USER root RUN echo export "GOPATH=/home/${USER_NAME}/.go" | tee -a $BASH_ENV -USER 1000 +USER 12021 RUN go env RUN set -ex; cd c; go get -d ./...; cat go.sum @@ -77,7 +77,7 @@ RUN set -ex; \ go get -d ./...; \ go mod tidy; -USER 1000 +USER 12021 SHELL [ "/bin/sh", "-c" ] RUN go env @@ -89,7 +89,7 @@ FROM base AS testc RUN prepare-tool golang -USER 1000 +USER 12021 # renovate: datasource=github-releases packageName=containerbase/golang-prebuild RUN install-tool golang 1.23.1 diff --git a/test/helm/Dockerfile b/test/helm/Dockerfile index 8777690f4..cc5c2a011 100644 --- a/test/helm/Dockerfile +++ b/test/helm/Dockerfile @@ -51,7 +51,7 @@ SHELL [ "/bin/sh", "-c" ] RUN helm version | grep "${HELM_VERSION}" -USER 1000 +USER 12021 RUN set -ex; \ helm repo add stable https://charts.helm.sh/stable; \ @@ -60,7 +60,7 @@ RUN set -ex; \ RUN helm version | grep "${HELM_VERSION}" # even more restricted -USER 1000:1000 +USER 12021:12021 RUN set -ex; \ helm repo update diff --git a/test/java/Dockerfile b/test/java/Dockerfile index 483af7598..325798c84 100644 --- a/test/java/Dockerfile +++ b/test/java/Dockerfile @@ -35,7 +35,7 @@ ARG CONTAINERBASE_CDN ARG CONTAINERBASE_DEBUG ARG CONTAINERBASE_LOG_LEVEL -COPY --chown=1000:0 test/java/test test +COPY --chown=12021:0 test/java/test test WORKDIR /test #-------------------------------------- @@ -78,7 +78,7 @@ RUN install-tool java 11.0.23+9 RUN prepare-tool gradle -USER 1000 +USER 12021 # stay on v6 RUN install-tool gradle 6.9 @@ -109,7 +109,7 @@ RUN install-tool java-jre 21.0.4+7.0.LTS # renovate: datasource=gradle-version versioning=gradle RUN install-tool gradle 8.10.2 -USER 1000 +USER 12021 RUN set -ex; \ gradle --version; @@ -208,7 +208,7 @@ RUN install-tool sbt v1.10.2 RUN install-tool gradle 8.8-rc-2 # doesn't work for arbitrary users -USER 1000 +USER 12021 WORKDIR /test RUN set -ex; \ diff --git a/test/jb/Dockerfile b/test/jb/Dockerfile index b7e6720c8..b6398cbe1 100644 --- a/test/jb/Dockerfile +++ b/test/jb/Dockerfile @@ -31,7 +31,7 @@ ARG CONTAINERBASE_CDN ARG CONTAINERBASE_DEBUG ARG CONTAINERBASE_LOG_LEVEL -COPY --chown=1000:0 test/jb/test test +COPY --chown=12021:0 test/jb/test test WORKDIR /test #-------------------------------------- @@ -39,7 +39,7 @@ WORKDIR /test #-------------------------------------- FROM base AS build -USER 1000 +USER 12021 # renovate: datasource=github-releases packageName=jsonnet-bundler/jsonnet-bundler RUN install-tool jb v0.6.0 diff --git a/test/latest/Dockerfile b/test/latest/Dockerfile index 55fef8520..e801cf3e6 100644 --- a/test/latest/Dockerfile +++ b/test/latest/Dockerfile @@ -172,7 +172,7 @@ RUN prepare-tool docker # renovate: datasource=github-tags packageName=git/git RUN install-tool git v2.46.2 -USER 1000 +USER 12021 RUN set -ex; id; id | grep "uid=${USER_ID}(${USER_NAME}) gid=0(root) groups=0(root),999(docker),${USER_ID}(${USER_NAME})" @@ -256,7 +256,7 @@ RUN helmfile version | grep "${HELMFILE_VERSION}" RUN kustomize version | grep "${KUSTOMIZE_VERSION}" -USER 1000 +USER 12021 RUN bazel --version diff --git a/test/nix/Dockerfile b/test/nix/Dockerfile index 1195bb7ae..1cd221049 100644 --- a/test/nix/Dockerfile +++ b/test/nix/Dockerfile @@ -31,7 +31,7 @@ ARG CONTAINERBASE_CDN ARG CONTAINERBASE_DEBUG ARG CONTAINERBASE_LOG_LEVEL -COPY --chown=1000:0 test/nix/test test +COPY --chown=12021:0 test/nix/test test WORKDIR /test #-------------------------------------- @@ -42,7 +42,7 @@ FROM base AS testa # old nix version, not for renovating RUN install-tool nix 2.10.3 -USER 1000 +USER 12021 RUN set -ex; \ nix --version @@ -54,7 +54,7 @@ RUN set -ex; \ --extra-experimental-features flakes \ eval --raw --file flake.nix inputs.nixpkgs.url -RUN --mount=type=secret,id=GITHUB_TOKEN,uid=1000 \ +RUN --mount=type=secret,id=GITHUB_TOKEN,uid=12021 \ set -ex; \ [ -f /run/secrets/GITHUB_TOKEN ] && export NIX_CONFIG="access-tokens = github.com=$(cat /run/secrets/GITHUB_TOKEN)"; \ nix \ @@ -68,7 +68,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN,uid=1000 \ FROM base AS testb -USER 1000 +USER 12021 # renovate: datasource=github-tags packageName=NixOS/nix RUN install-tool nix 2.24.9 @@ -83,7 +83,7 @@ RUN set -ex; \ eval --raw --file flake.nix inputs.nixpkgs.url -RUN --mount=type=secret,id=GITHUB_TOKEN,uid=1000 \ +RUN --mount=type=secret,id=GITHUB_TOKEN,uid=12021 \ set -ex; \ [ -f /run/secrets/GITHUB_TOKEN ] && export NIX_CONFIG="access-tokens = github.com=$(cat /run/secrets/GITHUB_TOKEN)"; \ nix \ diff --git a/test/node/Dockerfile b/test/node/Dockerfile index 8a5a1f66c..277ccf288 100644 --- a/test/node/Dockerfile +++ b/test/node/Dockerfile @@ -31,7 +31,7 @@ ARG CONTAINERBASE_CDN ARG CONTAINERBASE_DEBUG ARG CONTAINERBASE_LOG_LEVEL -COPY --chown=1000:0 test/node/test test +COPY --chown=12021:0 test/node/test test RUN chmod -R 775 /test WORKDIR /test @@ -46,7 +46,7 @@ RUN install-tool node 20.17.0 # ensure npmrc is writable by user RUN set -ex; [ $(stat --format '%u' "/opt/containerbase/home/.npmrc") -eq ${USER_ID} ] -USER 1000 +USER 12021 #-------------------------------------- @@ -88,7 +88,7 @@ USER root # renovate: datasource=npm RUN install-tool yarn 1.22.22 -USER 1000 +USER 12021 RUN set -ex; \ [ "$(command -v yarn)" = "/usr/local/bin/yarn" ] && echo "works" || exit 1; \ @@ -126,7 +126,7 @@ FROM base AS testd RUN prepare-tool node -USER 1000 +USER 12021 # renovate: datasource=github-releases packageName=containerbase/node-prebuild versioning=node RUN install-tool node v18.20.4 @@ -143,7 +143,7 @@ RUN set -ex; \ yarn --version; -COPY --chown=1000:0 test/node/test test +COPY --chown=12021:0 test/node/test test RUN set -ex; \ npm --version; \ @@ -169,7 +169,7 @@ RUN install-tool npm 8.0.0 RUN npm --version RUN npm --version | grep '8.0.0' -USER 1000 +USER 12021 # don't update!! Should overwrite npm RUN install-tool node 18.13.0 @@ -212,7 +212,7 @@ RUN set -ex; npm install -gf npm@8.0.0 RUN set -ex; command -v npm; npm --version RUN set -ex; npm --version | grep '8.0.0' -USER 1000 +USER 12021 RUN set -ex; command -v npm; npm --version RUN set -ex; npm --version | grep '8.0.0' RUN chmod -R g+w . @@ -251,9 +251,9 @@ RUN set -ex; ls -la $USER_HOME/; test -L $USER_HOME/.npmrc RUN touch /.dummy -USER 1000 +USER 12021 -COPY --chown=1000:0 test/node/test test +COPY --chown=12021:0 test/node/test test WORKDIR /test # don't update!! @@ -344,7 +344,7 @@ RUN install-tool corepack 0.9.0 RUN corepack --version | tee | grep '0.9.0' -USER 1000 +USER 12021 # renovate: datasource=npm RUN install-tool corepack 0.29.4 diff --git a/test/php/Dockerfile b/test/php/Dockerfile index b264366d8..5986e341b 100644 --- a/test/php/Dockerfile +++ b/test/php/Dockerfile @@ -31,7 +31,7 @@ ARG CONTAINERBASE_CDN ARG CONTAINERBASE_DEBUG ARG CONTAINERBASE_LOG_LEVEL -COPY --chown=1000:0 test/php/test test +COPY --chown=12021:0 test/php/test test WORKDIR /test #-------------------------------------- @@ -52,7 +52,7 @@ RUN install-tool composer 2.7.9 # test with latest version RUN install-tool composer latest -USER 1000 +USER 12021 RUN set -ex; \ [ ! -z "$(command -v php)" ] && echo "php installed" || exit 1; @@ -82,7 +82,7 @@ SHELL [ "/bin/sh", "-c" ] RUN prepare-tool php -USER 1000 +USER 12021 # test without version RUN install-tool php diff --git a/test/powershell/Dockerfile b/test/powershell/Dockerfile index c6cda8388..030c13a29 100644 --- a/test/powershell/Dockerfile +++ b/test/powershell/Dockerfile @@ -38,7 +38,7 @@ FROM base AS testa RUN prepare-tool powershell -USER 1000 +USER 12021 # Don't update RUN install-tool powershell v7.2.8 @@ -61,7 +61,7 @@ FROM base AS testb # renovate: datasource=github-releases packageName=PowerShell/PowerShell RUN install-tool powershell v7.4.5 -USER 1000 +USER 12021 RUN set -ex; \ pwsh -Version diff --git a/test/python/Dockerfile b/test/python/Dockerfile index 4fc7b8093..56a49c5a3 100644 --- a/test/python/Dockerfile +++ b/test/python/Dockerfile @@ -31,7 +31,7 @@ ARG CONTAINERBASE_CDN ARG CONTAINERBASE_DEBUG ARG CONTAINERBASE_LOG_LEVEL -COPY --chown=1000:0 test/python/test test +COPY --chown=12021:0 test/python/test test WORKDIR /test #-------------------------------------- @@ -50,7 +50,7 @@ FROM base AS build-rootless RUN prepare-tool python conan -USER 1000 +USER 12021 # renovate: datasource=github-releases packageName=containerbase/python-prebuild RUN install-tool python 3.12.6 @@ -65,7 +65,7 @@ RUN install-tool pipenv 2024.1.0 # renovate: datasource=pypi RUN install-tool pipenv 2024.1.0 -USER 1000 +USER 12021 #-------------------------------------- # build: poetry @@ -78,7 +78,7 @@ RUN install-tool poetry 1.8.3 # renovate: datasource=pypi RUN install-tool poetry 1.8.3 -USER 1000 +USER 12021 #-------------------------------------- # test pip-tools-a: pip-tools @@ -213,7 +213,7 @@ FROM build AS test-conan RUN prepare-tool conan -USER 1000 +USER 12021 # renovate: datasource=pypi RUN install-tool conan 2.8.0 diff --git a/test/ruby/Dockerfile b/test/ruby/Dockerfile index 0104269b4..ca37a6f3d 100644 --- a/test/ruby/Dockerfile +++ b/test/ruby/Dockerfile @@ -35,7 +35,7 @@ ARG CONTAINERBASE_CDN ARG CONTAINERBASE_DEBUG ARG CONTAINERBASE_LOG_LEVEL -COPY --chown=1000:0 test/ruby/test test +COPY --chown=12021:0 test/ruby/test test WORKDIR /test #-------------------------------------- @@ -54,7 +54,7 @@ FROM build AS test-bundler-b # renovate: datasource=rubygems depName=bundler RUN install-tool bundler 2.4.22 -USER 1000 +USER 12021 RUN ruby --version RUN bundler env @@ -71,7 +71,7 @@ RUN ruby --version #-------------------------------------- FROM build AS test-bundler-c -USER 1000 +USER 12021 # renovate: datasource=rubygems depName=bundler ENV BUNDLER_VERSION=2.5.20 @@ -103,9 +103,9 @@ FROM build AS test-bundler-d ENV BUNDLER_VERSION=2.5.20 RUN install-tool bundler -RUN set -ex; ls -la /usr/local/bin/; [ $(stat --format '%u' "/usr/local/bin/bundler") -eq 1000 ] +RUN set -ex; ls -la /usr/local/bin/; [ $(stat --format '%u' "/usr/local/bin/bundler") -eq 12021 ] -USER 1000 +USER 12021 # install old version RUN install-tool ruby 3.1.0 @@ -120,7 +120,7 @@ RUN install-tool bundler #-------------------------------------- FROM build AS test-cocoapods-a -USER 1000 +USER 12021 # renovate: datasource=rubygems RUN install-tool cocoapods 1.15.2 @@ -143,7 +143,7 @@ RUN set -ex; \ #-------------------------------------- FROM build AS test-gem -USER 1000 +USER 12021 RUN install-tool cocoapods diff --git a/test/rust/Dockerfile b/test/rust/Dockerfile index eaeff2d5e..52e5067e4 100644 --- a/test/rust/Dockerfile +++ b/test/rust/Dockerfile @@ -31,7 +31,7 @@ ARG CONTAINERBASE_CDN ARG CONTAINERBASE_DEBUG ARG CONTAINERBASE_LOG_LEVEL -COPY --chown=1000:0 test/rust/test test +COPY --chown=12021:0 test/rust/test test WORKDIR /test RUN prepare-tool rust @@ -50,7 +50,7 @@ RUN install-tool rust 1.81.0 RUN install-tool rust 1.81.0 -USER 1000 +USER 12021 #-------------------------------------- # test a: root @@ -71,7 +71,7 @@ RUN cargo --version #-------------------------------------- FROM base AS testb -USER 1000 +USER 12021 # renovate: datasource=docker versioning=docker RUN install-tool rust 1.81.0 diff --git a/test/swift/Dockerfile b/test/swift/Dockerfile index 0f6e5ea82..2ddd27c5a 100644 --- a/test/swift/Dockerfile +++ b/test/swift/Dockerfile @@ -35,7 +35,7 @@ ARG CONTAINERBASE_CDN ARG CONTAINERBASE_DEBUG ARG CONTAINERBASE_LOG_LEVEL -COPY --chown=1000:0 test/swift/test test +COPY --chown=12021:0 test/swift/test test WORKDIR /test #-------------------------------------- @@ -51,7 +51,7 @@ RUN install-tool swift 6.0.1 #-------------------------------------- FROM build AS testa -USER 1000 +USER 12021 RUN swift --version @@ -76,7 +76,7 @@ RUN swift --version #-------------------------------------- FROM build AS testb -USER 1000 +USER 12021 RUN install-tool swift 5.7.3