Commit 6db49dbf authored by Geoff Simmons's avatar Geoff Simmons

Unify versioning for Debian-based images.

parent faf6b48e
ARG go_version=1.21 ARG go_version=1.21
ARG debian_tag=bookworm-20240408-slim ARG DEBIAN_TAG
# Build k8s-crt-dnldr in the builder stage # Build k8s-crt-dnldr in the builder stage
FROM golang:${go_version} as builder FROM golang:${go_version} as builder
...@@ -23,7 +23,7 @@ RUN cd /go && git clone https://github.com/haproxytech/dataplaneapi.git && \ ...@@ -23,7 +23,7 @@ RUN cd /go && git clone https://github.com/haproxytech/dataplaneapi.git && \
cd /go/dataplaneapi && git checkout ${dataplane_version} && make build cd /go/dataplaneapi && git checkout ${dataplane_version} && make build
# Build haproxy # Build haproxy
FROM debian:${debian_tag} FROM debian:${DEBIAN_TAG}
ARG haproxy_version=2.6.12-1+deb12u1 ARG haproxy_version=2.6.12-1+deb12u1
......
FROM debian:bookworm-20240408-slim ARG DEBIAN_TAG
FROM debian:${DEBIAN_TAG}
ARG VERSION ARG VERSION
ARG DIST ARG DIST
ARG POOL ARG POOL
......
...@@ -41,6 +41,8 @@ ifeq ($(MINKUBE),1) ...@@ -41,6 +41,8 @@ ifeq ($(MINKUBE),1)
eval $(minikube docker-env) eval $(minikube docker-env)
endif endif
DEBIAN_TAG=bookworm-20240408-slim
VARNISH_VERSION=20240307 VARNISH_VERSION=20240307
VARNISH_DIST=bookworm-varnish VARNISH_DIST=bookworm-varnish
VARNISH_POOL=varnish VARNISH_POOL=varnish
...@@ -64,6 +66,7 @@ controller: Dockerfile.controller docker-minikube ...@@ -64,6 +66,7 @@ controller: Dockerfile.controller docker-minikube
varnish: Dockerfile.varnish docker-minikube varnish: Dockerfile.varnish docker-minikube
docker build $(DOCKER_BUILD_OPTIONS) \ docker build $(DOCKER_BUILD_OPTIONS) \
--build-arg DEBIAN_TAG=$(DEBIAN_TAG) \
--build-arg VERSION=$(VARNISH_VERSION) \ --build-arg VERSION=$(VARNISH_VERSION) \
--build-arg DIST=$(VARNISH_DIST) \ --build-arg DIST=$(VARNISH_DIST) \
--build-arg POOL=$(VARNISH_POOL) \ --build-arg POOL=$(VARNISH_POOL) \
...@@ -73,6 +76,7 @@ varnish: Dockerfile.varnish docker-minikube ...@@ -73,6 +76,7 @@ varnish: Dockerfile.varnish docker-minikube
klarlack: Dockerfile.varnish docker-minikube klarlack: Dockerfile.varnish docker-minikube
docker build $(DOCKER_BUILD_OPTIONS) \ docker build $(DOCKER_BUILD_OPTIONS) \
--build-arg DEBIAN_TAG=$(DEBIAN_TAG) \
--build-arg VERSION=$(KLARLACK_VERSION) \ --build-arg VERSION=$(KLARLACK_VERSION) \
--build-arg DIST=$(KLARLACK_DIST) \ --build-arg DIST=$(KLARLACK_DIST) \
--build-arg POOL=$(KLARLACK_POOL) \ --build-arg POOL=$(KLARLACK_POOL) \
...@@ -88,4 +92,5 @@ ascn: Dockerfile.ascn docker-minikube ...@@ -88,4 +92,5 @@ ascn: Dockerfile.ascn docker-minikube
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 \
--build-arg DEBIAN_TAG=$(DEBIAN_TAG) \
-f Dockerfile.haproxy . -f Dockerfile.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