Skip to content

Commit

Permalink
Merge pull request #56 from peter-evans/container-labels
Browse files Browse the repository at this point in the history
Add container labels
  • Loading branch information
peter-evans authored Mar 21, 2019
2 parents b569b0c + b7ca19a commit ab6dd7e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- run:
name: Build Docker image
command: |
docker build -t $IMAGE_NAME:$IMAGE_TAG $DOCKERFILE_PATH
docker build -t $IMAGE_NAME:$IMAGE_TAG $DOCKERFILE_PATH --label "org.opencontainers.image.version=${CIRCLE_TAG/v/''}"
- run:
name: Cache Docker image
command: docker save -o $IMAGE_TAG.tar $IMAGE_NAME
Expand Down
11 changes: 9 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
FROM peterevans/xenial-gcloud:1.2.22
FROM peterevans/xenial-gcloud:1.2.23

MAINTAINER Peter Evans <[email protected]>
LABEL \
maintainer="Peter Evans <[email protected]>" \
org.opencontainers.image.title="osrm-backend-k8s" \
org.opencontainers.image.description="Open Source Routing Machine (OSRM) osrm-backend for Kubernetes on Google Container Engine (GKE)." \
org.opencontainers.image.authors="Peter Evans <[email protected]>" \
org.opencontainers.image.url="https://github.com/peter-evans/osrm-backend-k8s" \
org.opencontainers.image.vendor="https://peterevans.dev" \
org.opencontainers.image.licenses="MIT"

ENV OSRM_VERSION 5.22.0

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ If you are looking for a more general purpose docker image, see [osrm-backend-do

## Supported tags and respective `Dockerfile` links

- [`1.21.0`, `1.21`, `latest` (*1.21/Dockerfile*)](https://github.com/peter-evans/osrm-backend-k8s/tree/master)
- [`1.21.1`, `1.21`, `latest` (*1.21/Dockerfile*)](https://github.com/peter-evans/osrm-backend-k8s/tree/master)
- [`1.20.0`, `1.20` (*1.20/Dockerfile*)](https://github.com/peter-evans/osrm-backend-k8s/tree/master/archive/1.20)
- [`1.19.0`, `1.19` (*1.19/Dockerfile*)](https://github.com/peter-evans/osrm-backend-k8s/tree/master/archive/1.19)
- [`1.18.0`, `1.18` (*1.18/Dockerfile*)](https://github.com/peter-evans/osrm-backend-k8s/tree/master/archive/1.18)
Expand Down

0 comments on commit ab6dd7e

Please sign in to comment.