Skip to content

Commit

Permalink
chore(dockerfile): various Dockerfile cleanups (#690)
Browse files Browse the repository at this point in the history
* chore(dockerfile): delete the (unused) java8 dockerfiles

* chore(dockerfile): replace deprecated MAINTAINER with LABEL

* chore(dockerfile): use gid/uid 10111 for the spinnaker user

* chore(dockerfile): make docker builds more cacheable
  • Loading branch information
plumpy committed Aug 13, 2020
1 parent e22863c commit 13487f2
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 88 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.compile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ RUN apk add --update \
openjdk11 \
openjdk8 \
&& rm -rf /var/cache/apk
MAINTAINER sig-platform@spinnaker.io
LABEL maintainer="sig-platform@spinnaker.io"
ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk
ENV JDK_18 /usr/lib/jvm/java-1.8-openjdk
ENV GRADLE_USER_HOME /workspace/.gradle
Expand Down
39 changes: 0 additions & 39 deletions Dockerfile.java8

This file was deleted.

11 changes: 6 additions & 5 deletions Dockerfile.slim
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
FROM alpine:3.11
MAINTAINER sig-platform@spinnaker.io
COPY rosco-web/build/install/rosco /opt/rosco
COPY rosco-web/config /opt/rosco
COPY halconfig/packer /opt/rosco/config/packer
LABEL maintainer="sig-platform@spinnaker.io"

WORKDIR /packer

Expand Down Expand Up @@ -32,7 +29,11 @@ RUN mkdir kustomize && \

ENV PATH "kustomize:$PATH"

RUN adduser -D -S spinnaker
RUN addgroup -S -g 10111 spinnaker
RUN adduser -S -G spinnaker -u 10111 spinnaker
COPY rosco-web/build/install/rosco /opt/rosco
COPY rosco-web/config /opt/rosco
COPY halconfig/packer /opt/rosco/config/packer
RUN mkdir -p /opt/rosco/plugins && chown -R spinnaker:nogroup /opt/rosco/plugins
USER spinnaker
CMD ["/opt/rosco/bin/rosco"]
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile.ubuntu
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
FROM ubuntu:bionic
MAINTAINER sig-platform@spinnaker.io
COPY rosco-web/build/install/rosco /opt/rosco
COPY rosco-web/config /opt/rosco
COPY halconfig/packer /opt/rosco/config/packer
LABEL maintainer="sig-platform@spinnaker.io"

WORKDIR /packer

Expand Down Expand Up @@ -32,7 +29,10 @@ RUN mkdir kustomize && \

ENV PATH "kustomize:$PATH"

RUN adduser --disabled-login --system spinnaker
RUN adduser --system --uid 10111 --group spinnaker
COPY rosco-web/build/install/rosco /opt/rosco
COPY rosco-web/config /opt/rosco
COPY halconfig/packer /opt/rosco/config/packer
RUN mkdir -p /opt/rosco/plugins && chown -R spinnaker:nogroup /opt/rosco/plugins
USER spinnaker
CMD ["/opt/rosco/bin/rosco"]
38 changes: 0 additions & 38 deletions Dockerfile.ubuntu-java8

This file was deleted.

0 comments on commit 13487f2

Please sign in to comment.