From 97c2a4cf273050378781de6e2d62a742377c9cc9 Mon Sep 17 00:00:00 2001 From: Benjamin Brummer Date: Wed, 29 Oct 2025 13:48:44 +0100 Subject: [PATCH] url as argument --- .github/workflows/publish-image-octane.yaml | 5 ++++- octane/Dockerfile | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-image-octane.yaml b/.github/workflows/publish-image-octane.yaml index 1c71a02..5adc2be 100644 --- a/.github/workflows/publish-image-octane.yaml +++ b/.github/workflows/publish-image-octane.yaml @@ -15,6 +15,7 @@ jobs: version: ${{ steps.version.outputs.version }} major: ${{ steps.version.outputs.major }} minor: ${{ steps.version.outputs.minor }} + url: ${{ steps.version.outputs.url }} steps: - id: version run: | @@ -25,6 +26,7 @@ jobs: fi MAJOR="$(echo "${VERSION}" | cut -d. -f1)" MINOR="$(echo "${VERSION}" | cut -d. -f2)" + URL=https://github.com/invoiceninja/invoiceninja/releases/download/v${VERSION}/invoiceninja.tar.gz # Debug output echo "Current version: ${VERSION}" @@ -33,6 +35,7 @@ jobs: echo "version=${VERSION}" >> $GITHUB_OUTPUT echo "major=${MAJOR}" >> $GITHUB_OUTPUT echo "minor=${MINOR}" >> $GITHUB_OUTPUT + echo "url=${URL}" >> $GITHUB_OUTPUT build: runs-on: ${{ startsWith(matrix.platform, 'linux/arm') && 'ubuntu-24.04-arm' || 'ubuntu-latest' }} @@ -75,7 +78,7 @@ jobs: uses: docker/build-push-action@v6 with: context: octane - build-args: INVOICENINJA_VERSION=${{ needs.version.outputs.version }} + build-args: URL=${{ needs.version.outputs.url }} platforms: ${{ matrix.platform }} labels: ${{ steps.meta.outputs.labels }} tags: ${{ env.REGISTRY_IMAGE }} diff --git a/octane/Dockerfile b/octane/Dockerfile index 6fda878..0b6f60c 100644 --- a/octane/Dockerfile +++ b/octane/Dockerfile @@ -4,7 +4,9 @@ ARG DEBIAN_VERSION=trixie FROM dunglas/frankenphp:${FRANKENPHP_VERSION}-php${PHP_VERSION}-${DEBIAN_VERSION} AS prepare-app -ADD https://github.com/invoiceninja/invoiceninja/releases/latest/download/invoiceninja.tar.gz /tmp/invoiceninja.tar.gz +ARG URL=https://github.com/invoiceninja/invoiceninja/releases/latest/download/invoiceninja.tar.gz + +ADD ${URL} /tmp/invoiceninja.tar.gz RUN tar -xf /tmp/invoiceninja.tar.gz \ && ln -s ./resources/views/react/index.blade.php ./public/index.html \