Merge pull request #829 from benbrummer/debian

url as argument
This commit is contained in:
David Bomba
2025-10-30 06:57:57 +11:00
committed by GitHub
2 changed files with 8 additions and 5 deletions

View File

@@ -15,6 +15,7 @@ jobs:
version: ${{ steps.version.outputs.version }} version: ${{ steps.version.outputs.version }}
major: ${{ steps.version.outputs.major }} major: ${{ steps.version.outputs.major }}
minor: ${{ steps.version.outputs.minor }} minor: ${{ steps.version.outputs.minor }}
url: ${{ steps.version.outputs.url }}
steps: steps:
- id: version - id: version
run: | run: |
@@ -25,6 +26,7 @@ jobs:
fi fi
MAJOR="$(echo "${VERSION}" | cut -d. -f1)" MAJOR="$(echo "${VERSION}" | cut -d. -f1)"
MINOR="$(echo "${VERSION}" | cut -d. -f2)" MINOR="$(echo "${VERSION}" | cut -d. -f2)"
URL=https://github.com/invoiceninja/invoiceninja/releases/download/v${VERSION}/invoiceninja.tar.gz
# Debug output # Debug output
echo "Current version: ${VERSION}" echo "Current version: ${VERSION}"
@@ -33,6 +35,7 @@ jobs:
echo "version=${VERSION}" >> $GITHUB_OUTPUT echo "version=${VERSION}" >> $GITHUB_OUTPUT
echo "major=${MAJOR}" >> $GITHUB_OUTPUT echo "major=${MAJOR}" >> $GITHUB_OUTPUT
echo "minor=${MINOR}" >> $GITHUB_OUTPUT echo "minor=${MINOR}" >> $GITHUB_OUTPUT
echo "url=${URL}" >> $GITHUB_OUTPUT
build: build:
runs-on: ${{ startsWith(matrix.platform, 'linux/arm') && 'ubuntu-24.04-arm' || 'ubuntu-latest' }} runs-on: ${{ startsWith(matrix.platform, 'linux/arm') && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
@@ -75,7 +78,7 @@ jobs:
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6
with: with:
context: debian context: debian
build-args: INVOICENINJA_VERSION=${{ needs.version.outputs.version }} build-args: URL=${{ needs.version.outputs.url }}
platforms: ${{ matrix.platform }} platforms: ${{ matrix.platform }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
tags: ${{ env.REGISTRY_IMAGE }} tags: ${{ env.REGISTRY_IMAGE }}

8
debian/Dockerfile vendored
View File

@@ -2,9 +2,9 @@ ARG PHP=8.4
FROM php:${PHP}-fpm AS prepare-app FROM php:${PHP}-fpm 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
USER www-data ADD ${URL} /tmp/invoiceninja.tar.gz
RUN tar -xzf /tmp/invoiceninja.tar.gz -C /var/www/html \ RUN tar -xzf /tmp/invoiceninja.tar.gz -C /var/www/html \
&& ln -s /var/www/html/resources/views/react/index.blade.php /var/www/html/public/index.html \ && ln -s /var/www/html/resources/views/react/index.blade.php /var/www/html/public/index.html \
@@ -76,8 +76,8 @@ RUN echo "skip-ssl = true" >> /etc/mysql/mariadb.conf.d/50-client.cnf
COPY supervisor/supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY supervisor/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
# Setup InvoiceNinja # Setup InvoiceNinja
COPY --from=prepare-app /var/www/html /var/www/html COPY --from=prepare-app --chown=www-data:www-data /var/www/html /var/www/html
COPY --from=prepare-app /tmp/public /tmp/public COPY --from=prepare-app --chown=www-data:www-data /tmp/public /tmp/public
# Add initialization script # Add initialization script
COPY --chmod=0755 scripts/init.sh /usr/local/bin/init.sh COPY --chmod=0755 scripts/init.sh /usr/local/bin/init.sh