Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add org.opencontainers.image.* labels to Dockerfiles #195

Merged
merged 1 commit into from
May 14, 2018
Merged

Add org.opencontainers.image.* labels to Dockerfiles #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@

#
Expand Down
8 changes: 7 additions & 1 deletion docker/Dockerfile.agent
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"