Merge pull request #163 from linuxserver/universal-docker-tags

update repo tags

Author: aptalca

.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' | sed 's|alpine-||g')"
+          COMPOSE_ALPINE_VERSION="$(echo ${COMPOSE_ALPINE_TAG} | sed 's|-ls.*||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 }} .

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-${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/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/baseimage-alpine:3.12 as buildstage