-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #195 from weaveworks/add-opencontainers-labels-to-…
…dockerfiles Add org.opencontainers.image.* labels to Dockerfiles
Showing
4 changed files
with
22 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,13 @@ | ||
FROM alpine:3.7 | ||
LABEL maintainer="Weaveworks Inc <[email protected]>" | ||
RUN apk add --no-cache ca-certificates | ||
COPY ./agent /usr/bin/launcher-agent | ||
COPY ./kubectl /usr/bin/kubectl | ||
ENTRYPOINT ["/usr/bin/launcher-agent"] | ||
CMD ["-help"] | ||
|
||
ARG revision | ||
LABEL maintainer="Weaveworks <[email protected]>" \ | ||
org.opencontainers.image.title="launcher-agent" \ | ||
org.opencontainers.image.source="https://github.com/weaveworks/launcher" \ | ||
org.opencontainers.image.revision="${revision}" \ | ||
org.opencontainers.image.vendor="Weaveworks" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,15 @@ | ||
FROM alpine:3.7 | ||
MAINTAINER Weaveworks Inc <[email protected]> | ||
WORKDIR / | ||
COPY service /launcher-service | ||
RUN mkdir static | ||
COPY static/install.sh /static/ | ||
COPY static/agent.yaml /static/ | ||
EXPOSE 80 | ||
ENTRYPOINT ["/launcher-service", "--bootstrap-version=@@GIT_HASH@@"] | ||
|
||
ARG revision | ||
LABEL maintainer="Weaveworks <[email protected]>" \ | ||
org.opencontainers.image.title="launcher-service" \ | ||
org.opencontainers.image.source="https://github.com/weaveworks/launcher" \ | ||
org.opencontainers.image.revision="${revision}" \ | ||
org.opencontainers.image.vendor="Weaveworks" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,4 +2,10 @@ FROM nginx | |
EXPOSE 80 | ||
ARG version | ||
RUN mkdir -p /usr/share/nginx/html/bootstrap/${version} | ||
COPY ./bootstrap/* /usr/share/nginx/html/bootstrap/${version}/ | ||
COPY ./bootstrap/* /usr/share/nginx/html/bootstrap/${version}/ | ||
|
||
LABEL maintainer="Weaveworks <[email protected]>" \ | ||
org.opencontainers.image.title="launcher-integration-tests" \ | ||
org.opencontainers.image.source="https://github.com/weaveworks/launcher/tree/master/integration-tests" \ | ||
org.opencontainers.image.revision="${version}" \ | ||
org.opencontainers.image.vendor="Weaveworks" |