Skip to content

Commit afceccf

Browse files
authored
Merge pull request #734 from benbrummer/master
github latest url, tar.gz, alpine 3.20
2 parents 7e466b3 + 320cdc9 commit afceccf

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

alpine/5/Dockerfile

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,28 @@
1+
ARG ALPINE_VERSION=3.20
12
ARG PHP_VERSION=8.2
23
ARG BAK_STORAGE_PATH=/var/www/app/docker-backup-storage/
34
ARG BAK_PUBLIC_PATH=/var/www/app/docker-backup-public/
45

56
# Get Invoice Ninja and install nodejs packages
6-
FROM --platform=$BUILDPLATFORM node:lts-alpine as nodebuild
7+
FROM --platform=$BUILDPLATFORM node:lts-alpine${ALPINE_VERSION} as nodebuild
78

89
# Download Invoice Ninja
910
ARG INVOICENINJA_VERSION
1011
ARG REPOSITORY=invoiceninja/invoiceninja
11-
ARG FILENAME=invoiceninja.tar
12+
ARG FILENAME=invoiceninja.tar.gz
1213

1314
RUN set -eux; apk add curl unzip grep
1415

15-
RUN DOWNLOAD_URL=$(curl -s "https://api.github.com/repos/invoiceninja/invoiceninja/releases/latest" | grep -o '"browser_download_url": "[^"]*invoiceninja.tar"' | cut -d '"' -f 4) && \
16-
curl -LJO "$DOWNLOAD_URL" && \
17-
mv invoiceninja.tar /tmp/ninja.tar
18-
1916
# Extract Invoice Ninja
20-
RUN mkdir -p /var/www/app \
21-
&& tar -xvf /tmp/ninja.tar -C /var/www/app/ \
22-
&& mkdir -p /var/www/app/public/logo /var/www/app/storage
17+
RUN mkdir -p /var/www/app
18+
RUN curl -sL "https://github.com/invoiceninja/invoiceninja/releases/latest/download/invoiceninja.tar.gz" | \
19+
tar -xz -C /var/www/app/
20+
RUN mkdir -p /var/www/app/public/logo /var/www/app/storage
2321

2422
WORKDIR /var/www/app
2523

2624
# Prepare php image
27-
FROM php:${PHP_VERSION}-fpm-alpine as phpbuild
25+
FROM php:${PHP_VERSION}-fpm-alpine${ALPINE_VERSION} as phpbuild
2826

2927
LABEL maintainer="David Bomba <[email protected]>"
3028

0 commit comments

Comments
 (0)