Build ASCN based on the right klarlack image

master is not correct when we build a tag - I was getting a build
based on an older image.
parent 8a27ee41
......@@ -427,6 +427,7 @@ dev:haproxy-timeouts:
variables:
IMAGE: ascn
script:
- docker pull $CI_REGISTRY_IMAGE/varnish-ingress/klarlack:$CI_COMMIT_REF_NAME || true
- cd container
- make ascn
......
ARG CI_REGISTRY_IMAGE
FROM $CI_REGISTRY_IMAGE/varnish-ingress/klarlack:master
FROM $CI_REGISTRY_IMAGE/varnish-ingress/klarlack:$CI_COMMIT_REF_NAME
# faac is non-free
RUN echo "deb http://deb.debian.org/debian bookworm non-free" | tee -a /etc/apt/sources.list
......
......@@ -56,6 +56,7 @@ klarlack: Dockerfile.klarlack docker-minikube
ascn: Dockerfile.ascn docker-minikube
docker build $(DOCKER_BUILD_OPTIONS) -t $(IMAGE_REPO)varnish-ingress/ascn \
--build-arg CI_REGISTRY_IMAGE=$(CI_REGISTRY_IMAGE) \
--build-arg CI_COMMIT_REF_NAME=$(CI_COMMIT_REF_NAME) \
-f Dockerfile.ascn .
haproxy: Dockerfile.haproxy docker-minikube
......
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