Skip to content

Commit

Permalink
revert back to /tiller
Browse files Browse the repository at this point in the history
when running `helm init --upgrade`, the entrypoint since v2.9.1 changed which
caused tiller to never start. Kubernetes may be holding onto the same entrypoint
during upgrades.
  • Loading branch information
Matthew Fisher committed Aug 1, 2018
1 parent bda27b6 commit cfbc174
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions rootfs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ RUN apk update && apk add ca-certificates socat && rm -rf /var/cache/apk/*

ENV HOME /tmp

COPY helm /bin/helm
COPY tiller /bin/tiller
COPY helm /helm
COPY tiller /tiller

EXPOSE 44134
USER nobody
ENTRYPOINT ["/bin/tiller"]
ENTRYPOINT ["/tiller"]

4 changes: 2 additions & 2 deletions rootfs/Dockerfile.experimental
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ RUN apk update && apk add ca-certificates && rm -rf /var/cache/apk/*

ENV HOME /tmp

COPY tiller /bin/tiller
COPY tiller /tiller

EXPOSE 44134
USER nobody
ENTRYPOINT ["/bin/tiller", "--experimental-release"]
ENTRYPOINT ["/tiller", "--experimental-release"]

0 comments on commit cfbc174

Please sign in to comment.