Skip to content

Commit

Permalink
feat(build): Ubuntu image variant support (#490)
Browse files Browse the repository at this point in the history
* feat(build): Building a ubuntu image

* New tagging format: `version-variant`, example: `1.2.3-slim`
* For backward compatibility with the buildtool system and older versions of Halyard, the alpine image variant keeps the original 'naked' version tag i.e. `1.2.3` in addition to the one with the new format.
* The BOM format doesn't change, it's up to Halyard to append the right `-variant` for a tag to fetch the right image on the registry.
* The Dockerfiles are meant to be used directly for ad-hoc image creation by an end-user and by the existing build system through `cloudbuild.yml`.

* Cloudbuild.yaml is now generic and lives in spinnaker/spinnaker buildtool
  • Loading branch information
Pierre Delagrave authored and ezimanyi committed Aug 20, 2019
1 parent d3a0ab8 commit 4914d73
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 34 deletions.
14 changes: 0 additions & 14 deletions Dockerfile

This file was deleted.

6 changes: 6 additions & 0 deletions Dockerfile.compile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM gcr.io/spinnaker-marketplace/gradle_cache
MAINTAINER delivery-engineering@netflix.com
ENV GRADLE_USER_HOME /gradle_cache/.gradle
COPY . compiled_sources
WORKDIR compiled_sources
RUN ./gradlew --no-daemon igor-web:installDist -x test
8 changes: 1 addition & 7 deletions Dockerfile.slim
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
FROM openjdk:8-jre-alpine

MAINTAINER delivery-engineering@netflix.com

COPY ./igor-web/build/install/igor /opt/igor

COPY --from=compile /compiled_sources/igor-web/build/install/igor /opt/igor
RUN apk --no-cache add --update bash

RUN adduser -D -S spinnaker

USER spinnaker

CMD ["/opt/igor/bin/igor"]
7 changes: 7 additions & 0 deletions Dockerfile.ubuntu
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM ubuntu:bionic
MAINTAINER delivery-engineering@netflix.com
COPY --from=compile /compiled_sources/igor-web/build/install/igor /opt/igor
RUN apt-get update && apt-get -y install openjdk-8-jre-headless wget
RUN adduser --disabled-login --system spinnaker
USER spinnaker
CMD ["/opt/igor/bin/igor"]
13 changes: 0 additions & 13 deletions cloudbuild.yaml

This file was deleted.

0 comments on commit 4914d73

Please sign in to comment.