Drop varnish 4, update alpine to 3.18, replace libexecinfo with libunwind

Author: csandanov

.alpine

@@ -1 +1 @@
-3.16#2023-09-29T02:08:44.358104Z
+3.18#2023-09-29T02:08:44.358104Z

.github/workflows/workflow.yml

@@ -28,16 +28,3 @@ jobs:
         version: '6.0.11'
         tags: 6.0,6,latest
         platform: linux/amd64,linux/arm64
-  varnish-4:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: docker/setup-qemu-action@v1
-      with:
-        platforms: amd64,arm64
-    - uses: docker/setup-buildx-action@v1
-    - uses: ./.github/actions
-      with:
-        version: '4.1.11'
-        tags: 4.1,4
-        platform: linux/amd64,linux/arm64

Dockerfile

@@ -21,8 +21,8 @@ RUN set -ex; \
         gcc \
         libc-dev \
         libedit \
-        libexecinfo \
         libmhash --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing/ \
+        libunwind \
         geoip \
         libgcc \
         make \
@@ -39,8 +39,8 @@ RUN set -ex; \
         git \
         geoip-dev \
         libedit-dev \
-        libexecinfo-dev \
         libmhash-dev --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing/ \
+        libunwind-dev \
         libtool \
         linux-headers \
         ncurses-dev \
@@ -51,7 +51,6 @@ RUN set -ex; \
         python3 \
         rsync; \
     \
-    ln -s /usr/bin/python3 /usr/bin/python; \
     varnish_url="http://varnish-cache.org/_downloads/varnish-${VARNISH_VER}.tgz"; \
     wget -qO- "${varnish_url}" | tar xz -C /tmp/; \
     cd /tmp/varnish-*; \
@@ -65,6 +64,7 @@ RUN set -ex; \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var/lib \
+        --with-unwind \
 		--without-jemalloc; \
     \
     make -j "$(nproc)"; \
@@ -174,7 +174,6 @@ RUN set -ex; \
     \
     while IFS= read -r file ; do rm -rf -- "${file}" ; done < /tmp/varnish-dev-files; \
     apk del --purge .varnish-build-deps; \
-    rm /usr/bin/python; \
     rm -rf /tmp/*; \
     rm -rf /var/cache/apk/*
 

Makefile

@@ -3,7 +3,7 @@
 VARNISH_VER ?= 6.0.11
 VARNISH_VER_MINOR = $(shell v='$(VARNISH_VER)'; echo "$${v%.*}")
 
-ALPINE_VER ?= 3.16
+ALPINE_VER ?= 3.18
 
 PLATFORM ?= linux/amd64
 

README.md

@@ -37,7 +37,6 @@ All images built for `linux/amd64` and `linux/arm64`
 Supported tags and respective `Dockerfile` links:
 
 - `6.0`, `6`, `latest` [_(Dockerfile)_](https://github.com/wodby/varnish/tree/master/Dockerfile)
-- `4.1`, `4` [_(Dockerfile)_](https://github.com/wodby/varnish/tree/master/Dockerfile)
 
 ## Environment Variables