diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml index dbbac80..bd0dd26 100644 --- a/.github/workflows/BuildImage.yml +++ b/.github/workflows/BuildImage.yml @@ -5,8 +5,8 @@ on: [push, pull_request_target, workflow_dispatch] env: GITHUB_REPO: "linuxserver/docker-mods" #don't modify ENDPOINT: "linuxserver/mods" #don't modify - BASEIMAGE: "sabnzbd" #replace - MODNAME: "par2cmdline-turbo" #replace + BASEIMAGE: "sabnzbd" + MODNAME: "par2cmdline-turbo" jobs: set-vars: @@ -20,7 +20,7 @@ jobs: echo "BASEIMAGE=${{ env.BASEIMAGE }}" >> $GITHUB_OUTPUT echo "MODNAME=${{ env.MODNAME }}" >> $GITHUB_OUTPUT # **** If the mod needs to be versioned, set the versioning logic below. Otherwise leave as is. **** - MOD_VERSION="" + MOD_VERSION=$(curl -s https://api.github.com/repos/animetosho/par2cmdline-turbo/releases/latest | jq -rc ".tag_name") echo "MOD_VERSION=${MOD_VERSION}" >> $GITHUB_OUTPUT outputs: GITHUB_REPO: ${{ steps.outputs.outputs.GITHUB_REPO }} diff --git a/Dockerfile b/Dockerfile index a922590..7090322 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,9 @@ # syntax=docker/dockerfile:1 ## Buildstage ## -FROM ghcr.io/linuxserver/baseimage-alpine:3.17 as buildstage-x86_64 +FROM ghcr.io/linuxserver/baseimage-alpine:3.18 as buildstage-x86_64 + +ARG MOD_VERSION RUN \ echo "**** install packages ****" && \ @@ -13,7 +15,7 @@ RUN \ mkdir /tmp/par2cmdline && \ curl -o \ /tmp/par2cmdline.tar.gz -L \ - "https://github.com/animetosho/par2cmdline-turbo/archive/refs/heads/turbo.tar.gz" && \ + "https://github.com/animetosho/par2cmdline-turbo/archive/${MOD_VERSION}.tar.gz" && \ tar xf \ /tmp/par2cmdline.tar.gz -C \ /tmp/par2cmdline --strip-components=1 && \ @@ -25,7 +27,9 @@ RUN \ make install DESTDIR=/root-layer ## Buildstage ## -FROM --platform=aarch64 ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17 as buildstage-aarch64 +FROM --platform=aarch64 ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18 as buildstage-aarch64 + +ARG MOD_VERSION RUN \ echo "**** install packages ****" && \ @@ -38,7 +42,7 @@ RUN \ mkdir /tmp/par2cmdline && \ curl -o \ /tmp/par2cmdline.tar.gz -L \ - "https://github.com/animetosho/par2cmdline-turbo/archive/refs/heads/turbo.tar.gz" && \ + "https://github.com/animetosho/par2cmdline-turbo/archive/${MOD_VERSION}.tar.gz" && \ tar xf \ /tmp/par2cmdline.tar.gz -C \ /tmp/par2cmdline --strip-components=1 && \