wululu_web/invoiceninja-docker
3
0
Fork 0
mirror of https://github.com/invoiceninja/dockerfiles.git synced 2026-02-06 14:17:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Dockerfiles to use ENV for BAK paths

Browse Source
This commit is contained in:
Lee Ween Jiann
2021-01-10 21:31:05 +08:00
parent 115b997cab
commit 35d9ee80b7
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
alpine/Dockerfile
View File

@@ -1,4 +1,6 @@
ARG PHP_VERSION=7.2 ARG PHP_VERSION=7.2
ARG BAK_STORAGE_PATH=/var/www/app/docker-backup-storage/
ARG BAK_PUBLIC_PATH=/var/www/app/docker-backup-public/
FROM php:${PHP_VERSION}-fpm-alpine FROM php:${PHP_VERSION}-fpm-alpine
@@ -8,6 +10,10 @@ LABEL maintainer="David Bomba <turbo124@gmail.com>"
# SYSTEM REQUIREMENT # SYSTEM REQUIREMENT
##### #####
ARG INVOICENINJA_VERSION ARG INVOICENINJA_VERSION
ARG BAK_STORAGE_PATH
ARG BAK_PUBLIC_PATH
ENV BAK_STORAGE_PATH $BAK_STORAGE_PATH
ENV BAK_PUBLIC_PATH $BAK_PUBLIC_PATH
WORKDIR /var/www/app WORKDIR /var/www/app
COPY entrypoint.sh /usr/local/bin/docker-entrypoint COPY entrypoint.sh /usr/local/bin/docker-entrypoint
@@ -60,8 +66,8 @@ ENV INVOICENINJA_VERSION="${INVOICENINJA_VERSION}"
RUN curl -s -o /tmp/ninja.zip -SL https://download.invoiceninja.com/ninja-v${INVOICENINJA_VERSION}.zip \ RUN curl -s -o /tmp/ninja.zip -SL https://download.invoiceninja.com/ninja-v${INVOICENINJA_VERSION}.zip \
&& bsdtar --strip-components=1 -C /var/www/app -xf /tmp/ninja.zip \ && bsdtar --strip-components=1 -C /var/www/app -xf /tmp/ninja.zip \
&& rm /tmp/ninja.zip \ && rm /tmp/ninja.zip \
&& mv /var/www/app/storage /var/www/app/docker-backup-storage \ && mv /var/www/app/storage $BAK_STORAGE_PATH \
&& mv /var/www/app/public /var/www/app/docker-backup-public \ && mv /var/www/app/public $BAK_PUBLIC_PATH \
&& mkdir -p /var/www/app/public/logo /var/www/app/storage \ && mkdir -p /var/www/app/public/logo /var/www/app/storage \
&& chmod -R 755 /var/www/app/storage \ && chmod -R 755 /var/www/app/storage \
&& rm -rf /var/www/app/docs /var/www/app/tests && rm -rf /var/www/app/docs /var/www/app/tests

12
alpine/Dockerfile_v5
View File

@@ -1,8 +1,12 @@
ARG PHP_VERSION=7.4 ARG PHP_VERSION=7.4
ARG BAK_STORAGE_PATH=/var/www/app/docker-backup-storage/
ARG BAK_PUBLIC_PATH=/var/www/app/docker-backup-public/
# Get Invoice Ninja and install nodejs packages # Get Invoice Ninja and install nodejs packages
FROM node:lts-alpine as frontend FROM node:lts-alpine as frontend
ARG INVOICENINJA_VERSION ARG INVOICENINJA_VERSION
ARG BAK_STORAGE_PATH
ARG BAK_PUBLIC_PATH
# Install dependencies # Install dependencies
RUN set -eux; \ RUN set -eux; \
@@ -23,13 +27,17 @@ WORKDIR /var/www/app/
RUN npm install --production \ RUN npm install --production \
&& npm run production \ && npm run production \
&& rm -rf node_modules \ && rm -rf node_modules \
&& mv /var/www/app/storage /var/www/app/docker-backup-storage/ \ && mv /var/www/app/storage $BAK_STORAGE_PATH \
&& mv /var/www/app/public /var/www/app/docker-backup-public/ && mv /var/www/app/public $BAK_PUBLIC_PATH
# Prepare php image # Prepare php image
FROM php:${PHP_VERSION}-fpm-alpine FROM php:${PHP_VERSION}-fpm-alpine
ARG INVOICENINJA_VERSION ARG INVOICENINJA_VERSION
ARG BAK_STORAGE_PATH
ARG BAK_PUBLIC_PATH
ENV INVOICENINJA_VERSION $INVOICENINJA_VERSION ENV INVOICENINJA_VERSION $INVOICENINJA_VERSION
ENV BAK_STORAGE_PATH $BAK_STORAGE_PATH
ENV BAK_PUBLIC_PATH $BAK_PUBLIC_PATH
LABEL maintainer="David Bomba <turbo124@gmail.com>" LABEL maintainer="David Bomba <turbo124@gmail.com>"