diff --git a/alpine/Dockerfile b/alpine/Dockerfile index daa3249..ea6f308 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,6 @@ 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 @@ -8,6 +10,10 @@ LABEL maintainer="David Bomba " # SYSTEM REQUIREMENT ##### 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 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 \ && bsdtar --strip-components=1 -C /var/www/app -xf /tmp/ninja.zip \ && rm /tmp/ninja.zip \ - && mv /var/www/app/storage /var/www/app/docker-backup-storage \ - && mv /var/www/app/public /var/www/app/docker-backup-public \ + && mv /var/www/app/storage $BAK_STORAGE_PATH \ + && mv /var/www/app/public $BAK_PUBLIC_PATH \ && mkdir -p /var/www/app/public/logo /var/www/app/storage \ && chmod -R 755 /var/www/app/storage \ && rm -rf /var/www/app/docs /var/www/app/tests diff --git a/alpine/Dockerfile_v5 b/alpine/Dockerfile_v5 index dac9450..bc7c57e 100644 --- a/alpine/Dockerfile_v5 +++ b/alpine/Dockerfile_v5 @@ -1,8 +1,12 @@ 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 FROM node:lts-alpine as frontend ARG INVOICENINJA_VERSION +ARG BAK_STORAGE_PATH +ARG BAK_PUBLIC_PATH # Install dependencies RUN set -eux; \ @@ -23,13 +27,17 @@ WORKDIR /var/www/app/ RUN npm install --production \ && npm run production \ && rm -rf node_modules \ - && mv /var/www/app/storage /var/www/app/docker-backup-storage/ \ - && mv /var/www/app/public /var/www/app/docker-backup-public/ + && mv /var/www/app/storage $BAK_STORAGE_PATH \ + && mv /var/www/app/public $BAK_PUBLIC_PATH # Prepare php image FROM php:${PHP_VERSION}-fpm-alpine ARG INVOICENINJA_VERSION +ARG BAK_STORAGE_PATH +ARG BAK_PUBLIC_PATH ENV INVOICENINJA_VERSION $INVOICENINJA_VERSION +ENV BAK_STORAGE_PATH $BAK_STORAGE_PATH +ENV BAK_PUBLIC_PATH $BAK_PUBLIC_PATH LABEL maintainer="David Bomba "