Commit 19b2d972 authored by Tim Leers's avatar Tim Leers Committed by Geoff Simmons

Rename image to klarlack

parent 3f72d96b
...@@ -55,6 +55,18 @@ build:haproxy:manual: ...@@ -55,6 +55,18 @@ build:haproxy:manual:
extends: .build-haproxy extends: .build-haproxy
when: manual when: manual
# build new klarlack image if dockerfile changes
build:klarlack:
extends: .build-klarlack
rules:
- changes:
- container/Dockerfile.klarlack
# klarlack image can be build when user triggers it
build:klarlack:manual:
extends: .build-klarlack
when: manual
# build new varnish image if dockerfile changes # build new varnish image if dockerfile changes
build:varnish: build:varnish:
extends: .build-varnish extends: .build-varnish
...@@ -278,7 +290,17 @@ example:varnish-pod-template: ...@@ -278,7 +290,17 @@ example:varnish-pod-template:
IMAGE: varnish IMAGE: varnish
script: script:
- cd container - cd container
- make varnish-bionic - make varnish
# basic step for a pipeline to build the klarlack image
.build-klarlack:
extends: .build-image
stage: build
variables:
IMAGE: klarlack
script:
- cd container
- make klarlack
# basic step for a pipeline to build the haproxy image # basic step for a pipeline to build the haproxy image
.build-haproxy: .build-haproxy:
......
...@@ -49,9 +49,9 @@ varnish: Dockerfile.varnish docker-minikube ...@@ -49,9 +49,9 @@ varnish: Dockerfile.varnish docker-minikube
docker build $(DOCKER_BUILD_OPTIONS) -t $(IMAGE_REPO)varnish-ingress/varnish \ docker build $(DOCKER_BUILD_OPTIONS) -t $(IMAGE_REPO)varnish-ingress/varnish \
-f Dockerfile.varnish . -f Dockerfile.varnish .
varnish-bionic: Dockerfile.varnish.bionic docker-minikube klarlack: Dockerfile.klarlack docker-minikube
docker build $(DOCKER_BUILD_OPTIONS) -t $(IMAGE_REPO)varnish-ingress/varnish \ docker build $(DOCKER_BUILD_OPTIONS) -t $(IMAGE_REPO)varnish-ingress/klarlack \
-f Dockerfile.varnish.bionic . -f Dockerfile.klarlack .
haproxy: Dockerfile.haproxy docker-minikube haproxy: Dockerfile.haproxy docker-minikube
docker build $(DOCKER_BUILD_OPTIONS) -t $(IMAGE_REPO)varnish-ingress/haproxy \ docker build $(DOCKER_BUILD_OPTIONS) -t $(IMAGE_REPO)varnish-ingress/haproxy \
......
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