Skip to content

K
k8s-vcl-reloader
Commit e45e4496 authored by Geoff Simmons's avatar Geoff Simmons
Browse files
Options

Bugfix image build in gitlab CI.

parent fe8a970f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
.gitlab-ci.yml
View file @ e45e4496
...@@ -61,7 +61,7 @@ build:reloader: ...@@ -61,7 +61,7 @@ build:reloader:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME || true - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME || true
after_script: after_script:
- docker tag $CI_REGISTRY_IMAGE $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA - docker tag uplex/k8s-vcl-reloader $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
- docker tag $CI_REGISTRY_IMAGE $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME - docker tag uplex/k8s-vcl-reloader $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
container/Makefile
View file @ e45e4496
...@@ -31,5 +31,5 @@ DOCKER_BUILD_OPTIONS = ...@@ -31,5 +31,5 @@ DOCKER_BUILD_OPTIONS =
VER ?= latest VER ?= latest
container: Dockerfile container: Dockerfile
docker build $(DOCKER_BUILD_OPTIONS) \ docker build $(DOCKER_BUILD_OPTIONS) -t uplex/k8s-vcl-reloader:$(VER) \
-t uplex/varnish/k8s-vcl-reloader:$(VER) -f Dockerfile .. -f Dockerfile ..
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment