From 0db61e2e6b9ce9bc6eb3f7e55eccf58ec1bf7265 Mon Sep 17 00:00:00 2001
From: "Aode (lion)" <asonix@asonix.dog>
Date: Wed, 22 Dec 2021 15:22:24 -0600
Subject: [PATCH] Fix nextcloud version generation

---
 .drone.yml | 6 +++---
 Dockerfile | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 96fa1d8..1ff71b9 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -9,7 +9,7 @@ steps:
 - name: prepare
   image: alpine:latest
   commands:
-  - sed -i'' "s/NEXTCLOUD_VERSION/$(echo "${DRONE_TAG}" | sed 's/-[[:alnum:]]\+$//')/g" Dockerfile
+  - sed -i'' "s/NEXTCLOUD_VERSION/$(echo "${DRONE_TAG}" | sed 's/^v//' | sed 's/-[[:alnum:]]\+$//')/g" Dockerfile
 
 - name: push
   image: plugins/docker:20
@@ -41,7 +41,7 @@ steps:
 - name: prepare
   image: alpine:latest
   commands:
-  - sed -i'' "s/NEXTCLOUD_VERSION/$(echo "${DRONE_TAG}" | sed 's/-[[:alnum:]]\+$//')/g" Dockerfile
+  - sed -i'' "s/NEXTCLOUD_VERSION/$(echo "${DRONE_TAG}" | sed 's/^v//' | sed 's/-[[:alnum:]]\+$//')/g" Dockerfile
 
 - name: push
   image: plugins/docker:20
@@ -73,7 +73,7 @@ steps:
 - name: prepare
   image: alpine:latest
   commands:
-  - sed -i'' "s/NEXTCLOUD_VERSION/$(echo "${DRONE_TAG}" | sed 's/-[[:alnum:]]\+$//')/g" Dockerfile
+  - sed -i'' "s/NEXTCLOUD_VERSION/$(echo "${DRONE_TAG}" | sed 's/^v//' | sed 's/-[[:alnum:]]\+$//')/g" Dockerfile
 
 - name: push
   image: plugins/docker:20
diff --git a/Dockerfile b/Dockerfile
index 4366271..c894951 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 ARG REPO_ARCH
 
-FROM linuxserver/nextcloud:$REPO_ARCH-NEXTCLOUD_VERSION
+FROM linuxserver/nextcloud:$REPO_ARCH-php8-NEXTCLOUD_VERSION
 
 ADD https://github.com/nextcloud/notify_push/releases/download/v0.3.0/notify_push-aarch64-unknown-linux-musl /usr/local/bin/notify_push
 RUN chmod +x /usr/local/bin/notify_push