From dcd253b04728b35587d545b5d9bbc3d617052ff3 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@linuxserver.io>
Date: Wed, 17 Feb 2021 17:46:49 -0500
Subject: [PATCH] update release and image tags

---
 .github/workflows/BuildImage.yml | 2 +-
 Dockerfile                       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml
index 18a885f..27bee9d 100644
--- a/.github/workflows/BuildImage.yml
+++ b/.github/workflows/BuildImage.yml
@@ -20,7 +20,7 @@ jobs:
           if [ -z ${COMPOSE_ALPINE_TAG+x} ]; then COMPOSE_ALPINE_TAG=$(curl -sX GET "https://api.github.com/repos/linuxserver/docker-docker-compose/releases" | jq -r 'first(.[] | select(.prerelease==true)) | .tag_name'); fi
           COMPOSE_VERSION=$(echo "$COMPOSE_TAG" | sed 's|-ls.*||g')
           echo "COMPOSE_VERSION=${COMPOSE_VERSION}" >> $GITHUB_ENV
-          COMPOSE_ALPINE_VERSION="$(echo ${COMPOSE_ALPINE_TAG} | sed 's|-ls.*||g')"
+          COMPOSE_ALPINE_VERSION="$(echo ${COMPOSE_ALPINE_TAG} | sed 's|-ls.*||g' | sed 's|alpine-||g')"
           if [ "$COMPOSE_VERSION" != "$COMPOSE_ALPINE_VERSION" ]; then echo "ubuntu and alpine versions are different; exiting!" && exit 1; else echo "ubuntu and alpine versions are the same, continuing with build"; fi
           # Build image
           docker build --no-cache --build-arg COMPOSE_TAG=${COMPOSE_TAG} --build-arg COMPOSE_ALPINE_TAG=${COMPOSE_ALPINE_TAG} -t ${{ github.sha }} .
diff --git a/Dockerfile b/Dockerfile
index c3ed525..3fcf896 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,9 +4,9 @@ ARG COMPOSE_ALPINE_TAG="alpine"
 FROM ghcr.io/linuxserver/docker-compose:amd64-${COMPOSE_TAG} as compose-amd64
 FROM ghcr.io/linuxserver/docker-compose:arm32v7-${COMPOSE_TAG} as compose-arm32
 FROM ghcr.io/linuxserver/docker-compose:arm64v8-${COMPOSE_TAG} as compose-arm64
-FROM ghcr.io/linuxserver/docker-compose:amd64-alpine-${COMPOSE_ALPINE_TAG} as compose-alpine-amd64
-FROM ghcr.io/linuxserver/docker-compose:arm32v7-alpine-${COMPOSE_ALPINE_TAG} as compose-alpine-arm32
-FROM ghcr.io/linuxserver/docker-compose:arm64v8-alpine-${COMPOSE_ALPINE_TAG} as compose-alpine-arm64
+FROM ghcr.io/linuxserver/docker-compose:amd64-${COMPOSE_ALPINE_TAG} as compose-alpine-amd64
+FROM ghcr.io/linuxserver/docker-compose:arm32v7-${COMPOSE_ALPINE_TAG} as compose-alpine-arm32
+FROM ghcr.io/linuxserver/docker-compose:arm64v8-${COMPOSE_ALPINE_TAG} as compose-alpine-arm64
 
 FROM ghcr.io/linuxserver/baseimage-alpine:3.12 as buildstage