From 742cbfe4329f792dc3fcac05dea3f4c645dc3e94 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Fri, 18 Aug 2023 09:39:44 -0400
Subject: [PATCH] rebase to 3.18, fix artifact sed

---
 Dockerfile         | 4 ++--
 Dockerfile.aarch64 | 4 ++--
 README.md          | 3 ++-
 readme-vars.yml    | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8b89deb..6a3253d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.17
+FROM ghcr.io/linuxserver/baseimage-alpine:3.18
 
 # set version label
 ARG BUILD_DATE
@@ -31,7 +31,7 @@ RUN \
     WEBGRAB_VER=$(curl -fsL http://webgrabplus.com/download/sw | grep -m1 /download/sw/v | sed 's|.*/download/sw/v\(.*\)">V.*|\1|'); \
   fi && \
   echo "Found Webgrabplus version ${WEBGRAB_VER}" && \
-  WEBGRAB_URL=$(curl -fsL http://webgrabplus.com/download/sw/v${WEBGRAB_VER} | grep '>Linux</a>' | sed 's|.*\(http://webgrab.*tar\.gz\).*|\1|') && \
+  WEBGRAB_URL=$(curl -fsL http://webgrabplus.com/download/sw/v${WEBGRAB_VER} | grep '>Linux</a>' | sed 's|.*\(http://webgrab.*.gz\).*|\1|') && \
   mkdir -p \
     /app/wg++ && \
   curl -o /tmp/wg++.tar.gz -L \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index e32566a..bdd0433 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18
 
 # set version label
 ARG BUILD_DATE
@@ -32,7 +32,7 @@ RUN \
     WEBGRAB_VER=$(curl -fsL http://webgrabplus.com/download/sw | grep -m1 /download/sw/v | sed 's|.*/download/sw/v\(.*\)">V.*|\1|'); \
   fi && \
   echo "Found Webgrabplus version ${WEBGRAB_VER}" && \
-  WEBGRAB_URL=$(curl -fsL http://webgrabplus.com/download/sw/v${WEBGRAB_VER} | grep '>Linux</a>' | sed 's|.*\(http://webgrab.*tar\.gz\).*|\1|') && \
+  WEBGRAB_URL=$(curl -fsL http://webgrabplus.com/download/sw/v${WEBGRAB_VER} | grep '>Linux</a>' | sed 's|.*\(http://webgrab.*\.gz\).*|\1|') && \
   mkdir -p \
     /app/wg++ && \
   curl -o /tmp/wg++.tar.gz -L \
diff --git a/README.md b/README.md
index 8f0a531..d96679c 100644
--- a/README.md
+++ b/README.md
@@ -255,7 +255,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
-* **16.08.23:** - Update dotnet framework to 7.x
+* **18.08.23:** - Rebase to Alpine 3.18.
+* **16.08.23:** - Update dotnet framework to 7.x.
 * **06.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)
 * **13.03.23:** - Rebase to Alpine 3.17.
 * **23.03.22:** - Rebase to Alpine 3.16 and s6v3. Update to dotnet 6.
diff --git a/readme-vars.yml b/readme-vars.yml
index c74cee7..40afbc8 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -64,7 +64,8 @@ app_setup_block: |
   ```
 # changelog
 changelogs:
-  - {date: "16.08.23:", desc: "Update dotnet framework to 7.x"}
+  - {date: "18.08.23:", desc: "Rebase to Alpine 3.18."}
+  - {date: "16.08.23:", desc: "Update dotnet framework to 7.x."}
   - {date: "06.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}
   - {date: "13.03.23:", desc: "Rebase to Alpine 3.17."}
   - {date: "23.03.22:", desc: "Rebase to Alpine 3.16 and s6v3. Update to dotnet 6."}