chore(build): Update with master

Dockerfile.compile

@@ -0,0 +1,5 @@
+FROM gcr.io/spinnaker-marketplace/gradle_cache
+ENV GRADLE_USER_HOME /gradle_cache/.gradle
+COPY . compiled_sources
+WORKDIR compiled_sources
+RUN ./gradlew installDist -x test -Prelease.useLastTag=true

Dockerfile.local

@@ -1,17 +1,10 @@
 FROM openjdk:8
-
-MAINTAINER [email protected]
+LABEL maintainer="[email protected]"
+COPY --from=halyard.compile /compiled_sources/halyard-web/build/install/halyard /opt/halyard
 
 ENV KUBECTL_RELEASE=1.12.7
 ENV AWS_BINARY_RELEASE_DATE=2019-03-27
 
-COPY . workdir/
-
-WORKDIR workdir
-
-RUN cp -r ./halyard-web/build/install/halyard /opt && \
-  cd .. && \
-  rm -rf workdir
 
 RUN echo '#!/usr/bin/env bash' | tee /usr/local/bin/hal > /dev/null && \
   echo '/opt/halyard/bin/hal "$@"' | tee /usr/local/bin/hal > /dev/null
@@ -28,6 +21,10 @@ RUN curl -o aws-iam-authenticator https://amazon-eks.s3-us-west-2.amazonaws.com/
 
 ENV PATH "$PATH:/usr/local/bin/aws-iam-authenticator"
 
+RUN wget -O /tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py && \
+    python /tmp/get-pip.py && \
+    pip install --upgrade awscli==1.16.208
+
 RUN useradd -m spinnaker
 
 USER spinnaker

Dockerfile.ubuntu

@@ -0,0 +1,29 @@
+FROM ubuntu:bionic
+LABEL maintainer="[email protected]"
+COPY --from=halyard.compile /compiled_sources/halyard-web/build/install/halyard /opt/halyard
+
+ENV KUBECTL_RELEASE=1.12.7
+ENV AWS_BINARY_RELEASE_DATE=2019-03-27
+ENV AWS_CLI_VERSION=1.16.208
+
+RUN apt-get update && \
+    apt-get upgrade -y && \
+    apt-get install -y \
+      curl \
+      python-pip && \
+    pip install awscli==${AWS_CLI_VERSION} --upgrade
+
+RUN echo '#!/usr/bin/env bash' | tee /usr/local/bin/hal > /dev/null && \
+  echo '/opt/halyard/bin/hal "$@"' | tee /usr/local/bin/hal > /dev/null
+RUN chmod +x /usr/local/bin/hal
+
+RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_RELEASE}/bin/linux/amd64/kubectl && \
+    chmod +x ./kubectl && \
+    mv ./kubectl /usr/local/bin/kubectl
+
+RUN curl -o  /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3-us-west-2.amazonaws.com/${KUBECTL_RELEASE}/${AWS_BINARY_RELEASE_DATE}/bin/linux/amd64/aws-iam-authenticator && \
+    chmod +x /usr/local/bin/aws-iam-authenticator
+
+RUN adduser --disabled-login --system spinnaker
+USER spinnaker
+CMD "/opt/halyard/bin/halyard"

README.md

@@ -57,3 +57,7 @@ halyard. To change these, check out the relevant bits in halyard-web/halyard-web
 __hal__ is a CLI for making changes to your __halconfig__ via the __daemon__.
 
 Read the command reference [here](docs/commands.md).
+
+# Container Images
+## Building locally
+Execute `./release/docker.sh` to build both the default `openjdk8` and `ubuntu` based images.

build.gradle

@@ -40,9 +40,6 @@ allprojects {
   apply plugin: 'java-library'
   apply plugin: 'groovy'
 
-  sourceSets.main.java.srcDirs = []
-  sourceSets.main.groovy.srcDirs += ["src/main/java"]
-
   test {
     testLogging {
       showStandardStreams = false