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

feat: add dumb-init as entrypoint #23

Merged
merged 1 commit into from
May 21, 2024
Merged
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
4 changes: 2 additions & 2 deletions 1.11/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN mix local.hex --force && \
# if you want them, please copy to your Dockerfile
&& apt-get update -qq \
&& apt-get install --yes --no-install-recommends \
unzip sudo jq wget curl ca-certificates \
unzip sudo jq wget curl ca-certificates dumb-init \
&& apt-get clean && apt-get autoclean && apt-get -y autoremove --purge \
&& rm -rf /var/lib/apt/lists/* /usr/share/doc /root/.cache/ \
&& curl -s "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m)-${AWSCLI_VERSION}.zip" -o /tmp/awscliv2.zip \
Expand All @@ -30,4 +30,4 @@ RUN mix local.hex --force && \

WORKDIR $SERVICE_ROOT

ENTRYPOINT [ "/entrypoint" ]
ENTRYPOINT [ "dumb-init", "--", "/entrypoint" ]
4 changes: 2 additions & 2 deletions 1.12/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN mix local.hex --force && \
# if you want them, please copy to your Dockerfile
&& apt-get update -qq \
&& apt-get install --yes --no-install-recommends \
unzip sudo jq wget curl ca-certificates \
unzip sudo jq wget curl ca-certificates dumb-init \
&& apt-get clean && apt-get autoclean && apt-get -y autoremove --purge \
&& rm -rf /var/lib/apt/lists/* /usr/share/doc /root/.cache/ \
&& curl -s "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m)-${AWSCLI_VERSION}.zip" -o /tmp/awscliv2.zip \
Expand All @@ -30,4 +30,4 @@ RUN mix local.hex --force && \

WORKDIR $SERVICE_ROOT

ENTRYPOINT [ "/entrypoint" ]
ENTRYPOINT [ "dumb-init", "--", "/entrypoint" ]
4 changes: 2 additions & 2 deletions 1.13/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ARG TARGETARCH
ADD --chmod=755 https://raw.githubusercontent.com/articulate/docker-bootstrap/main/scripts/install_packages /usr/local/bin/install_packages
ADD --chmod=755 https://raw.githubusercontent.com/articulate/docker-bootstrap/main/scripts/awscli.sh /tmp/awscli.sh

RUN install_packages make && /tmp/awscli.sh && rm /tmp/awscli.sh \
RUN install_packages make dumb-init && /tmp/awscli.sh && rm /tmp/awscli.sh \
&& groupadd --gid $SERVICE_UID $SERVICE_USER \
&& useradd --create-home --shell /bin/bash --gid $SERVICE_UID --uid $SERVICE_UID $SERVICE_USER

Expand All @@ -28,4 +28,4 @@ RUN mix local.hex --force && mix local.rebar --force
# Our entrypoint will pull in our environment variables from Consul and Vault,
# and execute whatever command we provided the container.
# See https://github.com/articulate/docker-bootstrap
ENTRYPOINT [ "/entrypoint" ]
ENTRYPOINT [ "dumb-init", "--", "/entrypoint" ]
4 changes: 2 additions & 2 deletions 1.13/legacy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN mix local.hex --force && \
# if you want them, please copy to your Dockerfile
&& apt-get update -qq \
&& apt-get install --yes --no-install-recommends \
unzip sudo jq wget curl ca-certificates \
unzip sudo jq wget curl ca-certificates dumb-init \
&& apt-get clean && apt-get autoclean && apt-get -y autoremove --purge \
&& rm -rf /var/lib/apt/lists/* /usr/share/doc /root/.cache/ \
&& curl -s "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m)-${AWSCLI_VERSION}.zip" -o /tmp/awscliv2.zip \
Expand All @@ -30,4 +30,4 @@ RUN mix local.hex --force && \

WORKDIR $SERVICE_ROOT

ENTRYPOINT [ "/entrypoint" ]
ENTRYPOINT [ "dumb-init", "--", "/entrypoint" ]
Loading