diff --git a/lazy.ansible/.manala/docker/Dockerfile.tmpl b/lazy.ansible/.manala/docker/Dockerfile.tmpl index 08a68fed..26446529 100644 --- a/lazy.ansible/.manala/docker/Dockerfile.tmpl +++ b/lazy.ansible/.manala/docker/Dockerfile.tmpl @@ -9,7 +9,6 @@ ARG DEBIAN_FRONTEND="noninteractive" ARG MANALA_USER_ID="1000" ARG MANALA_GROUP_ID="1000" -ARG GOSU_VERSION="1.17" ARG GOMPLATE_VERSION="3.11.7" ARG DIRENV_VERSION="2.33.0" @@ -45,10 +44,6 @@ RUN \ && adduser --home /home/lazy --shell /bin/bash --uid ${MANALA_USER_ID} --gecos lazy --ingroup lazy --disabled-password lazy \ && install --verbose --mode 0755 --group lazy --owner lazy --directory /run/user/${MANALA_USER_ID} \ && echo "lazy ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/lazy \ - # Gosu - && curl -sSL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-{{ include "arch_map" (dict "amd64" "amd64" "arm64" "arm64") }}" \ - --output /usr/local/bin/gosu \ - && chmod +x /usr/local/bin/gosu \ # Gomplate && curl -sSL "https://github.com/hairyhenderson/gomplate/releases/download/v${GOMPLATE_VERSION}/gomplate_linux-{{ include "arch_map" (dict "amd64" "amd64" "arm64" "arm64") }}" \ --output /usr/local/bin/gomplate \ diff --git a/lazy.ansible/.manala/docker/entrypoint.sh b/lazy.ansible/.manala/docker/entrypoint.sh index d8dd6462..9817d61f 100755 --- a/lazy.ansible/.manala/docker/entrypoint.sh +++ b/lazy.ansible/.manala/docker/entrypoint.sh @@ -54,4 +54,5 @@ if [ $# -eq 0 ] && [ -d "/etc/services.d" ]; then fi # Command -exec gosu lazy "$@" +export HOME="/home/lazy" +exec s6-setuidgid lazy "$@" diff --git a/lazy.ansible/test/goss.yaml b/lazy.ansible/test/goss.yaml index 69fbad9d..721388b7 100644 --- a/lazy.ansible/test/goss.yaml +++ b/lazy.ansible/test/goss.yaml @@ -47,10 +47,6 @@ file: command: # Base - gosu --version: - exit-status: 0 - stdout: - - "1.17" gomplate --version: exit-status: 0 stdout: diff --git a/lazy.kubernetes/.manala/docker/Dockerfile.tmpl b/lazy.kubernetes/.manala/docker/Dockerfile.tmpl index 52e71e3d..89e6c408 100644 --- a/lazy.kubernetes/.manala/docker/Dockerfile.tmpl +++ b/lazy.kubernetes/.manala/docker/Dockerfile.tmpl @@ -9,7 +9,6 @@ ARG DEBIAN_FRONTEND="noninteractive" ARG MANALA_USER_ID="1000" ARG MANALA_GROUP_ID="1000" -ARG GOSU_VERSION="1.17" ARG GOMPLATE_VERSION="3.11.7" ARG DIRENV_VERSION="2.33.0" @@ -45,10 +44,6 @@ RUN \ && adduser --home /home/lazy --shell /bin/bash --uid ${MANALA_USER_ID} --gecos lazy --ingroup lazy --disabled-password lazy \ && install --verbose --mode 0755 --group lazy --owner lazy --directory /run/user/${MANALA_USER_ID} \ && echo "lazy ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/lazy \ - # Gosu - && curl -sSL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-{{ include "arch_map" (dict "amd64" "amd64" "arm64" "arm64") }}" \ - --output /usr/local/bin/gosu \ - && chmod +x /usr/local/bin/gosu \ # Gomplate && curl -sSL "https://github.com/hairyhenderson/gomplate/releases/download/v${GOMPLATE_VERSION}/gomplate_linux-{{ include "arch_map" (dict "amd64" "amd64" "arm64" "arm64") }}" \ --output /usr/local/bin/gomplate \ diff --git a/lazy.kubernetes/.manala/docker/entrypoint.sh b/lazy.kubernetes/.manala/docker/entrypoint.sh index d8dd6462..9817d61f 100755 --- a/lazy.kubernetes/.manala/docker/entrypoint.sh +++ b/lazy.kubernetes/.manala/docker/entrypoint.sh @@ -54,4 +54,5 @@ if [ $# -eq 0 ] && [ -d "/etc/services.d" ]; then fi # Command -exec gosu lazy "$@" +export HOME="/home/lazy" +exec s6-setuidgid lazy "$@" diff --git a/lazy.kubernetes/test/goss.yaml b/lazy.kubernetes/test/goss.yaml index 0ae50daf..fb2c1069 100644 --- a/lazy.kubernetes/test/goss.yaml +++ b/lazy.kubernetes/test/goss.yaml @@ -33,10 +33,6 @@ file: command: # Base - gosu --version: - exit-status: 0 - stdout: - - "1.17" gomplate --version: exit-status: 0 stdout: diff --git a/lazy.symfony/.manala/docker/Dockerfile.tmpl b/lazy.symfony/.manala/docker/Dockerfile.tmpl index 6e88280b..16034c3e 100644 --- a/lazy.symfony/.manala/docker/Dockerfile.tmpl +++ b/lazy.symfony/.manala/docker/Dockerfile.tmpl @@ -9,7 +9,6 @@ ARG DEBIAN_FRONTEND="noninteractive" ARG MANALA_USER_ID="1000" ARG MANALA_GROUP_ID="1000" -ARG GOSU_VERSION="1.17" ARG GOMPLATE_VERSION="3.11.7" ARG DIRENV_VERSION="2.33.0" @@ -45,10 +44,6 @@ RUN \ && adduser --home /home/lazy --shell /bin/bash --uid ${MANALA_USER_ID} --gecos lazy --ingroup lazy --disabled-password lazy \ && install --verbose --mode 0755 --group lazy --owner lazy --directory /run/user/${MANALA_USER_ID} \ && echo "lazy ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/lazy \ - # Gosu - && curl -sSL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-{{ include "arch_map" (dict "amd64" "amd64" "arm64" "arm64") }}" \ - --output /usr/local/bin/gosu \ - && chmod +x /usr/local/bin/gosu \ # Gomplate && curl -sSL "https://github.com/hairyhenderson/gomplate/releases/download/v${GOMPLATE_VERSION}/gomplate_linux-{{ include "arch_map" (dict "amd64" "amd64" "arm64" "arm64") }}" \ --output /usr/local/bin/gomplate \ diff --git a/lazy.symfony/.manala/docker/entrypoint.sh b/lazy.symfony/.manala/docker/entrypoint.sh index d8dd6462..9817d61f 100755 --- a/lazy.symfony/.manala/docker/entrypoint.sh +++ b/lazy.symfony/.manala/docker/entrypoint.sh @@ -54,4 +54,5 @@ if [ $# -eq 0 ] && [ -d "/etc/services.d" ]; then fi # Command -exec gosu lazy "$@" +export HOME="/home/lazy" +exec s6-setuidgid lazy "$@" diff --git a/lazy.symfony/test/goss.yaml b/lazy.symfony/test/goss.yaml index 9ae4575a..121cf776 100644 --- a/lazy.symfony/test/goss.yaml +++ b/lazy.symfony/test/goss.yaml @@ -41,10 +41,6 @@ file: command: # Base - gosu --version: - exit-status: 0 - stdout: - - "1.17" gomplate --version: exit-status: 0 stdout: