Skip to content

Commit

Permalink
Drop varnish 4, update alpine to 3.18, replace libexecinfo with libun…
Browse files Browse the repository at this point in the history
…wind
  • Loading branch information
csandanov committed Sep 29, 2023
1 parent 2c59581 commit acb5489
Show file tree
Hide file tree
Showing 9 changed files with 5 additions and 97 deletions.
2 changes: 1 addition & 1 deletion .alpine
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.16#2023-09-29T02:08:44.358104Z
3.18#2023-09-29T02:08:44.358104Z
13 changes: 0 additions & 13 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 3 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand All @@ -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-*; \
Expand All @@ -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)"; \
Expand Down Expand Up @@ -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/*

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
11 changes: 0 additions & 11 deletions patches/4/fix-compat-execinfo.patch

This file was deleted.

44 changes: 0 additions & 44 deletions patches/4/fix-stack-overflow.patch

This file was deleted.

11 changes: 0 additions & 11 deletions patches/4/musl-mode_t.patch

This file was deleted.

11 changes: 0 additions & 11 deletions patches/4/varnish-4.1.3_fix_Werror_el6.patch

This file was deleted.

0 comments on commit acb5489

Please sign in to comment.