fix(container): use git tags as-is

ssube · Jul 1, 2019 · a72597d · a72597d
1 parent c9ea33a
commit a72597d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -56,7 +56,7 @@ stages:
   variables: &vars-docker
     DOCKER_DRIVER: overlay2
     DOCKER_HOST: tcp://localhost:2375
-    IMAGE_TAG: ssube/salty-dog:$CI_COMMIT_REF_SLUG
+    IMAGE_TAG: ssube/salty-dog:${CI_COMMIT_TAG:-${CI_COMMIT_REF_SLUG}}
 
 .build-node: &build-node
   image: apextoaster/node:11.15

diff --git a/README.md b/README.md
@@ -119,8 +119,7 @@ To run with Docker: `docker run --rm ssube/salty-dog:master`
 The latest semi-stable image is `ssube/salty-dog:master`. All
 [tags are listed here](https://cloud.docker.com/repository/docker/ssube/salty-dog/tags).
 
-The Docker container is published for each branch and git tag, tagged with the version slug (`.` replaced with `-`,
-mostly).
+The Docker container is published for each branch and git tag, tagged with the git tag (or branch slug).
 
 Rules are baked into the image in `/salty-dog/rules`. To use custom rules, mount them with
 `-v $(pwd)/rules:/salty-dog/rules:ro` and load with `--rules /rules/foo.yml`.