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

[Lazy] Remove gosu #418

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions lazy.ansible/.manala/docker/Dockerfile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion lazy.ansible/.manala/docker/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 "$@"
4 changes: 0 additions & 4 deletions lazy.ansible/test/goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ file:

command:
# Base
gosu --version:
exit-status: 0
stdout:
- "1.17"
gomplate --version:
exit-status: 0
stdout:
Expand Down
5 changes: 0 additions & 5 deletions lazy.kubernetes/.manala/docker/Dockerfile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion lazy.kubernetes/.manala/docker/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 "$@"
4 changes: 0 additions & 4 deletions lazy.kubernetes/test/goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ file:

command:
# Base
gosu --version:
exit-status: 0
stdout:
- "1.17"
gomplate --version:
exit-status: 0
stdout:
Expand Down
5 changes: 0 additions & 5 deletions lazy.symfony/.manala/docker/Dockerfile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion lazy.symfony/.manala/docker/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 "$@"
4 changes: 0 additions & 4 deletions lazy.symfony/test/goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ file:

command:
# Base
gosu --version:
exit-status: 0
stdout:
- "1.17"
gomplate --version:
exit-status: 0
stdout:
Expand Down
Loading