Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
k8s-ingress
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
3
Merge Requests
3
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
uplex-varnish
k8s-ingress
Commits
6db49dbf
Commit
6db49dbf
authored
Apr 19, 2024
by
Geoff Simmons
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Unify versioning for Debian-based images.
parent
faf6b48e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
3 deletions
+10
-3
Dockerfile.haproxy
container/Dockerfile.haproxy
+2
-2
Dockerfile.varnish
container/Dockerfile.varnish
+3
-1
Makefile
container/Makefile
+5
-0
No files found.
container/Dockerfile.haproxy
View file @
6db49dbf
ARG go_version=1.21
ARG
debian_tag=bookworm-20240408-slim
ARG
DEBIAN_TAG
# Build k8s-crt-dnldr in the builder stage
FROM golang:${go_version} as builder
...
...
@@ -23,7 +23,7 @@ RUN cd /go && git clone https://github.com/haproxytech/dataplaneapi.git && \
cd /go/dataplaneapi && git checkout ${dataplane_version} && make build
# Build haproxy
FROM debian:${
debian_tag
}
FROM debian:${
DEBIAN_TAG
}
ARG haproxy_version=2.6.12-1+deb12u1
...
...
container/Dockerfile.varnish
View file @
6db49dbf
FROM debian:bookworm-20240408-slim
ARG DEBIAN_TAG
FROM debian:${DEBIAN_TAG}
ARG VERSION
ARG DIST
ARG POOL
...
...
container/Makefile
View file @
6db49dbf
...
...
@@ -41,6 +41,8 @@ ifeq ($(MINKUBE),1)
eval
$(minikube
docker-env)
endif
DEBIAN_TAG
=
bookworm-20240408-slim
VARNISH_VERSION
=
20240307
VARNISH_DIST
=
bookworm-varnish
VARNISH_POOL
=
varnish
...
...
@@ -64,6 +66,7 @@ controller: Dockerfile.controller docker-minikube
varnish
:
Dockerfile.varnish docker-minikube
docker build
$(DOCKER_BUILD_OPTIONS)
\
--build-arg
DEBIAN_TAG
=
$(DEBIAN_TAG)
\
--build-arg
VERSION
=
$(VARNISH_VERSION)
\
--build-arg
DIST
=
$(VARNISH_DIST)
\
--build-arg
POOL
=
$(VARNISH_POOL)
\
...
...
@@ -73,6 +76,7 @@ varnish: Dockerfile.varnish docker-minikube
klarlack
:
Dockerfile.varnish docker-minikube
docker build
$(DOCKER_BUILD_OPTIONS)
\
--build-arg
DEBIAN_TAG
=
$(DEBIAN_TAG)
\
--build-arg
VERSION
=
$(KLARLACK_VERSION)
\
--build-arg
DIST
=
$(KLARLACK_DIST)
\
--build-arg
POOL
=
$(KLARLACK_POOL)
\
...
...
@@ -88,4 +92,5 @@ ascn: Dockerfile.ascn docker-minikube
haproxy
:
Dockerfile.haproxy docker-minikube
docker build
$(DOCKER_BUILD_OPTIONS)
-t
$(IMAGE_REPO)
varnish-ingress/haproxy
\
--build-arg
DEBIAN_TAG
=
$(DEBIAN_TAG)
\
-f
Dockerfile.haproxy .
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment