Skip to content

Commit

Permalink
chore(java11): Switch the default containers to use Java 11. (#499)
Browse files Browse the repository at this point in the history
  • Loading branch information
plumpy authored and mergify[bot] committed Jan 15, 2020
1 parent 34a269b commit 6f715b1
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 2 deletions.
30 changes: 30 additions & 0 deletions Dockerfile.java8
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
FROM alpine:3.11
MAINTAINER [email protected]
COPY --from=compile /compiled_sources/rosco-web/build/install/rosco /opt/rosco
COPY --from=compile /compiled_sources/rosco-web/config /opt/rosco
COPY --from=compile /compiled_sources/rosco-web/config/packer /opt/rosco/config/packer

WORKDIR /packer

RUN apk --no-cache add --update bash wget curl openssl openjdk8-jre && \
wget https://releases.hashicorp.com/packer/1.4.4/packer_1.4.4_linux_amd64.zip && \
unzip packer_1.4.4_linux_amd64.zip && \
rm packer_1.4.4_linux_amd64.zip

ENV PATH "/packer:$PATH"

RUN wget https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get && \
chmod +x get && \
./get && \
rm get

RUN mkdir kustomize && \
curl -s -L https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v3.3.0/kustomize_v3.3.0_linux_amd64.tar.gz |\
tar xvz -C kustomize/

ENV PATH "kustomize:$PATH"

RUN adduser -D -S spinnaker
USER spinnaker
CMD ["/opt/rosco/bin/rosco"]

2 changes: 1 addition & 1 deletion Dockerfile.slim
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ COPY --from=compile /compiled_sources/rosco-web/config/packer /opt/rosco/c

WORKDIR /packer

RUN apk --no-cache add --update bash wget curl openssl openjdk8-jre && \
RUN apk --no-cache add --update bash wget curl openssl openjdk11-jre && \
wget https://releases.hashicorp.com/packer/1.4.4/packer_1.4.4_linux_amd64.zip && \
unzip packer_1.4.4_linux_amd64.zip && \
rm packer_1.4.4_linux_amd64.zip
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ COPY --from=compile /compiled_sources/rosco-web/config/packer /opt/rosco/c

WORKDIR /packer

RUN apt-get update && apt-get -y install openjdk-8-jre-headless wget unzip curl && \
RUN apt-get update && apt-get -y install openjdk-11-jre-headless wget unzip curl && \
wget https://releases.hashicorp.com/packer/1.4.4/packer_1.4.4_linux_amd64.zip && \
unzip packer_1.4.4_linux_amd64.zip && \
rm packer_1.4.4_linux_amd64.zip
Expand Down
29 changes: 29 additions & 0 deletions Dockerfile.ubuntu-java8
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
FROM ubuntu:bionic
MAINTAINER [email protected]
COPY --from=compile /compiled_sources/rosco-web/build/install/rosco /opt/rosco
COPY --from=compile /compiled_sources/rosco-web/config /opt/rosco
COPY --from=compile /compiled_sources/rosco-web/config/packer /opt/rosco/config/packer

WORKDIR /packer

RUN apt-get update && apt-get -y install openjdk-8-jre-headless wget unzip curl && \
wget https://releases.hashicorp.com/packer/1.4.4/packer_1.4.4_linux_amd64.zip && \
unzip packer_1.4.4_linux_amd64.zip && \
rm packer_1.4.4_linux_amd64.zip

ENV PATH "/packer:$PATH"

RUN wget https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get && \
chmod +x get && \
./get && \
rm get

RUN mkdir kustomize && \
curl -s -L https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v3.3.0/kustomize_v3.3.0_linux_amd64.tar.gz |\
tar xvz -C kustomize/

ENV PATH "kustomize:$PATH"

RUN adduser --disabled-login --system spinnaker
USER spinnaker
CMD ["/opt/rosco/bin/rosco"]

0 comments on commit 6f715b1

Please sign in to comment.