Unverified Commit 3fb32f79 authored by Matthew Fisher's avatar Matthew Fisher Committed by GitHub

Merge pull request #3965 from jstoja/dockerfile_root_user

Change tiller's Dockerfile to use USER nobody + upgrades to alpine:3.7
parents ce272a46 f0d78180
...@@ -12,15 +12,15 @@ ...@@ -12,15 +12,15 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM alpine:3.3 FROM alpine:3.7
RUN apk update && apk add ca-certificates && rm -rf /var/cache/apk/* RUN apk update && apk add ca-certificates && rm -rf /var/cache/apk/*
ENV HOME /tmp ENV HOME /tmp
COPY tiller /tiller COPY tiller /bin/tiller
EXPOSE 44134 EXPOSE 44134
USER nobody
CMD ["/tiller"] ENTRYPOINT ["/bin/tiller"]
...@@ -12,15 +12,15 @@ ...@@ -12,15 +12,15 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM alpine:3.3 FROM alpine:3.7
RUN apk update && apk add ca-certificates && rm -rf /var/cache/apk/* RUN apk update && apk add ca-certificates && rm -rf /var/cache/apk/*
ENV HOME /tmp ENV HOME /tmp
COPY tiller /tiller COPY tiller /bin/tiller
EXPOSE 44134 EXPOSE 44134
USER nobody
CMD ["/tiller", "--experimental-release"] ENTRYPOINT ["/bin/tiller", "--experimental-release"]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment