Skip to content

Commit 67062f2

Browse files
authored
Merge pull request #1075 from linuxserver/universal-docker-tag
update upstream release tag
2 parents db8cc8f + 44637d9 commit 67062f2

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.github/workflows/BuildImage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
echo "MULTI_ARCH=${{ env.MULTI_ARCH }}" >> $GITHUB_OUTPUT
2424
# **** If the mod needs to be versioned, set the versioning logic below. Otherwise leave as is. ****
2525
COMPOSE_RELEASE=$(curl -sX GET "https://api.github.com/repos/docker/compose/releases/latest" | awk '/tag_name/{print $4;exit}' FS='[""]' | sed 's|^v||')
26-
DOCKER_RELEASE=$(curl -sX GET "https://api.github.com/repos/moby/moby/releases/latest" | awk '/tag_name/{print $4;exit}' FS='[""]' | sed 's|^v||')
26+
DOCKER_RELEASE=$(curl -sX GET "https://api.github.com/repos/moby/moby/releases/latest" | awk '/tag_name/{print $4;exit}' FS='[""]' | sed 's|^docker-||' | sed 's|^v||')
2727
MOD_VERSION="${DOCKER_RELEASE}-${COMPOSE_RELEASE}"
2828
echo "MOD_VERSION=${MOD_VERSION}" >> $GITHUB_OUTPUT
2929
outputs:

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:3.19 as buildstage
3+
FROM ghcr.io/linuxserver/baseimage-alpine:3.22 AS buildstage
44

55
ARG MOD_VERSION
66

@@ -9,6 +9,7 @@ RUN \
99
if [ -z "${MOD_VERSION+x}" ]; then \
1010
DOCKER_RELEASE=$(curl -sX GET "https://api.github.com/repos/moby/moby/releases/latest" \
1111
| awk '/tag_name/{print $4;exit}' FS='[""]' \
12+
| sed 's|^docker-||' \
1213
| sed 's|^v||'); \
1314
COMPOSE_RELEASE=$(curl -sX GET "https://api.github.com/repos/docker/compose/releases/latest" \
1415
| awk '/tag_name/{print $4;exit}' FS='[""]' \

0 commit comments

Comments
 (0)