github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-16 03:49:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add org.opencontainers.image.* labels to Dockerfiles

Browse Source 
- This should ultimately help for image-to-code back references.
- `org.label-schema.*` labels are now deprecated, in favour of `org.opencontainers.image.*` labels.
  See also: https://github.com/opencontainers/image-spec/blob/master/annotations.md#back-compatibility-with-label-schema
- Git revision (`git rev-parse HEAD`) is now injected at `docker build` time.
This commit is contained in:
Marc Carré
2018-05-11 18:45:49 +01:00
parent 5adb73c561
commit 4e58b83024
16 changed files with 103 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -11,6 +11,7 @@ SCOPE_UI_BUILD_UPTODATE=.scope_ui_build.uptodate
SCOPE_BACKEND_BUILD_IMAGE=$(DOCKERHUB_USER)/scope-backend-build
SCOPE_BACKEND_BUILD_UPTODATE=.scope_backend_build.uptodate
SCOPE_VERSION=$(shell git rev-parse --short HEAD)
GIT_REVISION=$(shell git rev-parse HEAD)
WEAVENET_VERSION=2.1.3
RUNSVINIT=vendor/runsvinit/runsvinit
CODECGEN_DIR=vendor/github.com/ugorji/go/codec/codecgen
@@ -56,7 +57,7 @@ docker/%: %
cp $* docker/
%.tar: docker/Dockerfile.%
$(SUDO) docker build -t $(DOCKERHUB_USER)/$* -f $< docker/
$(SUDO) docker build --build-arg=revision=$(GIT_REVISION) -t $(DOCKERHUB_USER)/$* -f $< docker/
$(SUDO) docker tag $(DOCKERHUB_USER)/$* $(DOCKERHUB_USER)/$*:$(IMAGE_TAG)
$(SUDO) docker save $(DOCKERHUB_USER)/$*:latest > $@

7
backend/Dockerfile
View File

@@ -21,3 +21,10 @@ RUN go get -tags netgo \
RUN pip install yapf==0.16.2 flake8==3.3.0
COPY build.sh /
ENTRYPOINT ["/build.sh"]
ARG revision
LABEL maintainer="Weaveworks <help@weave.works>" \
org.opencontainers.image.title="backend" \
org.opencontainers.image.source="https://github.com/weaveworks/scope/tree/master/backend" \
org.opencontainers.image.revision="${revision}" \
org.opencontainers.image.vendor="Weaveworks"

7
client/Dockerfile
View File

@@ -4,3 +4,10 @@ COPY package.json yarn.lock /home/weave/
ENV NPM_CONFIG_LOGLEVEL=warn NPM_CONFIG_PROGRESS=false
RUN yarn --pure-lockfile
COPY webpack.local.config.js webpack.production.config.js server.js .babelrc .eslintrc .eslintignore .stylelintrc .sass-lint.yml /home/weave/
ARG revision
LABEL maintainer="Weaveworks <help@weave.works>" \
org.opencontainers.image.title="client" \
org.opencontainers.image.source="https://github.com/weaveworks/scope" \
org.opencontainers.image.revision="${revision}" \
org.opencontainers.image.vendor="Weaveworks"

10
docker/Dockerfile.cloud-agent
View File

@@ -1,9 +1,15 @@
FROM alpine:3.5
LABEL maintainer="Weaveworks Inc <help@weave.works>"
LABEL works.weave.role=system
WORKDIR /home/weave
RUN apk add --update bash conntrack-tools iproute2 util-linux curl && \
rm -rf /var/cache/apk/*
ADD ./weave ./weaveutil /usr/bin/
COPY ./scope /home/weave/
ENTRYPOINT ["/home/weave/scope", "--mode=probe", "--no-app", "--probe.docker=true"]
ARG revision
LABEL works.weave.role="system" \
maintainer="Weaveworks <help@weave.works>" \
org.opencontainers.image.title="cloud-agent" \
org.opencontainers.image.source="https://github.com/weaveworks/scope" \
org.opencontainers.image.revision="${revision}" \
org.opencontainers.image.vendor="Weaveworks"

7
docker/Dockerfile.scope
View File

@@ -7,3 +7,10 @@ COPY ./run-app /etc/service/app/run
COPY ./run-probe /etc/service/probe/run
EXPOSE 4040
ENTRYPOINT ["/home/weave/entrypoint.sh"]
ARG revision
LABEL maintainer="Weaveworks <help@weave.works>" \
org.opencontainers.image.title="scope" \
org.opencontainers.image.source="https://github.com/weaveworks/scope" \
org.opencontainers.image.revision="${revision}" \
org.opencontainers.image.vendor="Weaveworks"

7
extras/dialer/Dockerfile
View File

@@ -1,2 +1,9 @@
FROM golang:1.7
ADD ./bin/dialer /go/bin
ARG revision
LABEL maintainer="Weaveworks <help@weave.works>" \
org.opencontainers.image.title="dialer" \
org.opencontainers.image.source="https://github.com/weaveworks/scope/tree/master/extras/dialer" \
org.opencontainers.image.revision="${revision}" \
org.opencontainers.image.vendor="Weaveworks"

3
extras/example/Makefile
View File

@@ -1,6 +1,7 @@
CC=gcc
CFLAGS=-g -lpthread
BUILD_IN_CONTAINER=true
GIT_REVISION := $(shell git rev-parse HEAD)
all: .qotd.marker .app.marker .client.marker .searchapp.marker .shout.marker .frontend.marker .frontend-k8s.marker .echo.marker .trace_app.marker
@@ -33,7 +34,7 @@ endif
.echo.marker: echo/*
.trace_app.marker: trace_app/*
.%.marker:
docker build -t tomwilkie/$(<D) $(<D)/
docker build --build-arg=revision=$(GIT_REVISION) -t tomwilkie/$(<D) $(<D)/
touch $@
clean:

8
extras/example/app/Dockerfile
View File

@@ -1,8 +1,14 @@
FROM tatsushid/tinycore-python:2.7
LABEL maintainer="Weaveworks Inc <help@weave.works>"
WORKDIR /home/weave
ADD requirements.txt /home/weave/
RUN pip install -r /home/weave/requirements.txt
ADD app.py /home/weave/
EXPOSE 5000
ENTRYPOINT ["python", "/home/weave/app.py"]
ARG revision
LABEL maintainer="Weaveworks <help@weave.works>" \
org.opencontainers.image.title="example-app" \
org.opencontainers.image.source="https://github.com/weaveworks/scope/tree/master/extras/example/app" \
org.opencontainers.image.revision="${revision}" \
org.opencontainers.image.vendor="Weaveworks"

8
extras/example/client/Dockerfile
View File

@@ -1,7 +1,13 @@
FROM tatsushid/tinycore-python:2.7
LABEL maintainer="Weaveworks Inc <help@weave.works>"
WORKDIR /home/weave
ADD requirements.txt /home/weave/
RUN pip install -r /home/weave/requirements.txt
ADD client.py /home/weave/
ENTRYPOINT ["python", "/home/weave/client.py"]
ARG revision
LABEL maintainer="Weaveworks <help@weave.works>" \
org.opencontainers.image.title="example-client" \
org.opencontainers.image.source="https://github.com/weaveworks/scope/tree/master/extras/example/client" \
org.opencontainers.image.revision="${revision}" \
org.opencontainers.image.vendor="Weaveworks"

8
extras/example/echo/Dockerfile
View File

@@ -1,8 +1,14 @@
FROM tatsushid/tinycore-python:2.7
LABEL maintainer="Weaveworks Inc <help@weave.works>"
WORKDIR /home/weave
ADD requirements.txt /home/weave/
RUN pip install -r /home/weave/requirements.txt
ADD echo.py /home/weave/
EXPOSE 5000
ENTRYPOINT ["python", "/home/weave/echo.py"]
ARG revision
LABEL maintainer="Weaveworks <help@weave.works>" \
org.opencontainers.image.title="example-echo" \
org.opencontainers.image.source="https://github.com/weaveworks/scope/tree/master/extras/example/echo" \
org.opencontainers.image.revision="${revision}" \
org.opencontainers.image.vendor="Weaveworks"

8
extras/example/frontend-k8s/Dockerfile
View File

@@ -1,5 +1,4 @@
FROM ubuntu
LABEL maintainer="Weaveworks Inc <help@weave.works>"
RUN apt-get update && \
apt-get install -y nginx && \
rm -rf /var/lib/apt/lists/*
@@ -9,3 +8,10 @@ RUN rm /etc/nginx/sites-available/default && \
COPY default.conf /etc/nginx/conf.d/
EXPOSE 80
CMD ["nginx", "-g", "daemon off;"]
ARG revision
LABEL maintainer="Weaveworks <help@weave.works>" \
org.opencontainers.image.title="example-frontend-k8s" \
org.opencontainers.image.source="https://github.com/weaveworks/scope/tree/master/extras/example/frontend-k8s" \
org.opencontainers.image.revision="${revision}" \
org.opencontainers.image.vendor="Weaveworks"

8
extras/example/frontend/Dockerfile
View File

@@ -1,5 +1,4 @@
FROM ubuntu
LABEL maintainer="Weaveworks Inc <help@weave.works>"
RUN apt-get update && \
apt-get install -y nginx && \
rm -rf /var/lib/apt/lists/*
@@ -9,3 +8,10 @@ RUN rm /etc/nginx/sites-available/default && \
COPY default.conf /etc/nginx/conf.d/
EXPOSE 80
CMD ["nginx", "-g", "daemon off;"]
ARG revision
LABEL maintainer="Weaveworks <help@weave.works>" \
org.opencontainers.image.title="example-frontend" \
org.opencontainers.image.source="https://github.com/weaveworks/scope/tree/master/extras/example/frontend" \
org.opencontainers.image.revision="${revision}" \
org.opencontainers.image.vendor="Weaveworks"

8
extras/example/qotd/Dockerfile
View File

@@ -1,6 +1,12 @@
FROM ubuntu
LABEL maintainer="Weaveworks Inc <help@weave.works>"
WORKDIR /home/weave
ADD ./qotd /home/weave/
EXPOSE 4446
ENTRYPOINT ["/home/weave/qotd"]
ARG revision
LABEL maintainer="Weaveworks <help@weave.works>" \
org.opencontainers.image.title="example-qotd" \
org.opencontainers.image.source="https://github.com/weaveworks/scope/tree/master/extras/example/qotd" \
org.opencontainers.image.revision="${revision}" \
org.opencontainers.image.vendor="Weaveworks"

8
extras/example/searchapp/Dockerfile
View File

@@ -1,6 +1,12 @@
FROM progrium/busybox
LABEL maintainer="Weaveworks Inc <help@weave.works>"
WORKDIR /home/weave
ADD searchapp /home/weave/
EXPOSE 8080
ENTRYPOINT ["/home/weave/searchapp"]
ARG revision
LABEL maintainer="Weaveworks <help@weave.works>" \
org.opencontainers.image.title="example-searchapp" \
org.opencontainers.image.source="https://github.com/weaveworks/scope/tree/master/extras/example/searchapp" \
org.opencontainers.image.revision="${revision}" \
org.opencontainers.image.vendor="Weaveworks"

8
extras/example/shout/Dockerfile
View File

@@ -1,6 +1,12 @@
FROM alpine:latest
LABEL maintainer="Weaveworks Inc <help@weave.works>"
WORKDIR /home/weave
ADD shout /home/weave/
EXPOSE 8090
ENTRYPOINT ["/home/weave/shout"]
ARG revision
LABEL maintainer="Weaveworks <help@weave.works>" \
org.opencontainers.image.title="example-shout" \
org.opencontainers.image.source="https://github.com/weaveworks/scope/tree/master/extras/example/shout" \
org.opencontainers.image.revision="${revision}" \
org.opencontainers.image.vendor="Weaveworks"

8
extras/example/trace_app/Dockerfile
View File

@@ -1,8 +1,14 @@
FROM tatsushid/tinycore-python:2.7
LABEL maintainer="Weaveworks Inc <help@weave.works>"
WORKDIR /home/weave
ADD requirements.txt /home/weave/
RUN pip install -r /home/weave/requirements.txt
ADD app.py /home/weave/
EXPOSE 5000
ENTRYPOINT ["python", "/home/weave/app.py"]
ARG revision
LABEL maintainer="Weaveworks <help@weave.works>" \
org.opencontainers.image.title="example-trace_app" \
org.opencontainers.image.source="https://github.com/weaveworks/scope/tree/master/extras/example/trace_app" \
org.opencontainers.image.revision="${revision}" \
org.opencontainers.image.vendor="Weaveworks"