Skip to content

Commit

Permalink
add dumb-init to collect orphaned processes such as git-remote-http
Browse files Browse the repository at this point in the history
  • Loading branch information
Dmitriy Kalinin committed Oct 6, 2020
1 parent b21e07d commit b71a521
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RUN CGO_ENABLED=0 GOOS=linux go build -ldflags=-buildid= -trimpath -o controller
# Needs ubuntu for installing git/openssh
FROM ubuntu:bionic

RUN apt-get update && apt-get install -y git openssh-client && rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install -y git openssh-client dumb-init && rm -rf /var/lib/apt/lists/*

RUN groupadd -g 2000 kapp-controller && useradd -r -u 1000 --create-home -g kapp-controller kapp-controller
USER kapp-controller
Expand All @@ -59,4 +59,4 @@ COPY --from=0 /usr/local/bin/sops .
COPY --from=0 /usr/local/bin/kapp .

ENV PATH="/:${PATH}"
ENTRYPOINT ["/kapp-controller"]
ENTRYPOINT ["dumb-init", "--", "/kapp-controller"]
1 change: 0 additions & 1 deletion config/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ spec:
containers:
- name: kapp-controller
image: kapp-controller
command: ["/kapp-controller"]
args:
#@ if/end data.values.dangerous_allow_shared_service_account:
- -dangerous-allow-shared-service-account=true
Expand Down

0 comments on commit b71a521

Please sign in to comment.