From 6f715b18077f7ca41e47a36ba172e5f9108ff56c Mon Sep 17 00:00:00 2001
From: Michael Plump <plumpy@google.com>
Date: Wed, 15 Jan 2020 14:39:15 -0500
Subject: [PATCH] chore(java11): Switch the default containers to use Java 11.
 (#499)

---
 Dockerfile.java8        | 30 ++++++++++++++++++++++++++++++
 Dockerfile.slim         |  2 +-
 Dockerfile.ubuntu       |  2 +-
 Dockerfile.ubuntu-java8 | 29 +++++++++++++++++++++++++++++
 4 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 Dockerfile.java8
 create mode 100644 Dockerfile.ubuntu-java8

diff --git a/Dockerfile.java8 b/Dockerfile.java8
new file mode 100644
index 000000000..79d92ce0d
--- /dev/null
+++ b/Dockerfile.java8
@@ -0,0 +1,30 @@
+FROM alpine:3.11
+MAINTAINER delivery-engineering@netflix.com
+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"]
+
diff --git a/Dockerfile.slim b/Dockerfile.slim
index 79d92ce0d..1133b5b73 100644
--- a/Dockerfile.slim
+++ b/Dockerfile.slim
@@ -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
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index eebdf4ce1..e73f2ddab 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -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
diff --git a/Dockerfile.ubuntu-java8 b/Dockerfile.ubuntu-java8
new file mode 100644
index 000000000..eebdf4ce1
--- /dev/null
+++ b/Dockerfile.ubuntu-java8
@@ -0,0 +1,29 @@
+FROM ubuntu:bionic
+MAINTAINER delivery-engineering@netflix.com
+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"]