feat: Publish livingdocs/varnish:7.6.1-r0

Author: marcbachmann

Dockerfile

@@ -1,11 +1,11 @@
-FROM golang:1.13.10-alpine3.11 as go
+FROM golang:1.23.5-alpine3.21 AS go
 RUN apk add --no-cache git
-RUN go get -d github.com/jonnenauha/prometheus_varnish_exporter
-RUN cd /go/src/github.com/jonnenauha/prometheus_varnish_exporter && git checkout 1.6 && go build -ldflags "-X 'main.Version=1.6' -X 'main.VersionHash=$(git rev-parse --short HEAD)' -X 'main.VersionDate=$(date -u '+%d.%m.%Y %H:%M:%S')'" -o /go/bin/prometheus_varnish_exporter
+RUN git clone https://github.com/jonnenauha/prometheus_varnish_exporter.git
+RUN cd prometheus_varnish_exporter && git checkout 1.6 && go build -ldflags "-X 'main.Version=1.6' -X 'main.VersionHash=$(git rev-parse --short HEAD)' -X 'main.VersionDate=$(date -u '+%d.%m.%Y %H:%M:%S')'" -o /go/bin/prometheus_varnish_exporter
 
-FROM node:20-alpine
+FROM node:22-alpine
 WORKDIR /etc/varnish
-ENV VARNISH_VERSION=7.3.0-r1
+ENV VARNISH_VERSION=7.6.1-r0
 
 COPY --from=go /go/bin/* /usr/local/bin/
 
@@ -15,7 +15,7 @@ RUN echo 'Install utils that stay in the image' \
   && apk add --no-cache varnish=$VARNISH_VERSION --repository http://dl-3.alpinelinux.org/alpine/edge/main/ \
   && echo 'Install varnish-modules' \
   && apk add --virtual varnish-deps --no-cache git libgit2-dev automake varnish-dev=$VARNISH_VERSION autoconf libtool py-docutils make --repository http://dl-3.alpinelinux.org/alpine/edge/main/ \
-  && git clone https://github.com/varnish/varnish-modules.git /varnish-modules --depth='1' --branch='7.3' --single-branch \
+  && git clone https://github.com/varnish/varnish-modules.git /varnish-modules --depth='1' --branch='7.6' --single-branch \
   && cd /varnish-modules && ./bootstrap && ./configure && make && make install && cd / \
   && echo 'Remove all build deps' \
   && rm -Rf /varnish-modules \

README.md

@@ -17,8 +17,34 @@ How this is different than other varnish operators for Kubernetes:
 
 ### Build
 
+For multi arch builds on Docker we use buildx. You have to create a builder before being able to build the containers.
+```
+docker buildx create --name container --driver=docker-container container
+```
+
+The following functions are used to build and push images on x86 machines:
+```
+buildcontainer () { docker buildx build --no-cache --platform linux/amd64,linux/arm64  "$@" }
+pushcontainer () { for var in "$@"; do docker push "$var"; done }
+```
+
+On Apple Silicon Macs, you have to upload the images to a registry that supports multi-arch images in one step.
+
+```
+buildcontainer () { docker buildx build --no-cache --push --platform linux/amd64,linux/arm64  "$@" }
+```
+
+With Lima
+```
+lima sudo systemctl start containerd
+lima sudo nerdctl run --privileged --rm tonistiigi/binfmt:qemu-v8.1.5 --install all
+
+buildcontainer () { nerdctl build --platform=amd64,arm64 "$@" }
+pushcontainer () { for var in "$@"; do nerdctl push --all-platforms "$var"; done }
+```
+
 ```sh
-docker build -t livingdocs/varnish .
+buildcontainer -t livingdocs/varnish .
 ```
 
 ### Run
@@ -38,7 +64,7 @@ Attention, parameters in the config file always overwrite those cli parameters.
 
 ```sh
 # For example use microcaching of requests, use a ttl of 1
-docker run --rm -it -p 8080:8080 --name varnish livingdocs/varnish --backend host.docker.internal:8081 -p default_ttl=1 -p default_grace=60
+docker run --rm -it -p 8080:8080 --name varnish livingdocs/varnish --backend example.com:80 -p default_ttl=1 -p default_grace=60
 ```
 
 ### With YAML config file