Skip to content

Commit

Permalink
Merge pull request #195 from weaveworks/add-opencontainers-labels-to-…
Browse files Browse the repository at this point in the history
…dockerfiles

Add org.opencontainers.image.* labels to Dockerfiles
marccarre authored May 14, 2018
2 parents 2241038 + dbd70c8 commit 6813f16
Showing 4 changed files with 22 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ docker/Dockerfile.service: docker/Dockerfile.service.in Makefile
build/.%.done: docker/Dockerfile.%
mkdir -p ./build/docker/$*
cp -r $^ ./build/docker/$*/
${DOCKER} build -t quay.io/weaveworks/launcher-$* -t quay.io/weaveworks/launcher-$*:$(IMAGE_TAG) -f build/docker/$*/Dockerfile.$* ./build/docker/$*
${DOCKER} build --build-arg=revision=$(GIT_HASH) -t quay.io/weaveworks/launcher-$* -t quay.io/weaveworks/launcher-$*:$(IMAGE_TAG) -f build/docker/$*/Dockerfile.$* ./build/docker/$*
touch $@

#
8 changes: 7 additions & 1 deletion docker/Dockerfile.agent
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"
8 changes: 7 additions & 1 deletion docker/Dockerfile.service.in
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"
8 changes: 7 additions & 1 deletion integration-tests/docker/Dockerfile.nginx-bootstrap
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"

0 comments on commit 6813f16

Please sign in to comment.