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

Improvements for build

Browse Source
This commit is contained in:
David Bomba
2024-04-04 22:01:41 +11:00
parent 5609b988f3
commit 47db01612d
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
alpine/5/Dockerfile
View File

@@ -17,6 +17,8 @@ RUN mkdir -p /var/www/app \
&& tar -xvf /tmp/ninja.tar -C /var/www/app/ \ && tar -xvf /tmp/ninja.tar -C /var/www/app/ \
&& mkdir -p /var/www/app/public/logo /var/www/app/storage && mkdir -p /var/www/app/public/logo /var/www/app/storage
WORKDIR /var/www/app
RUN rm -f /var/www/app/public/main.* RUN rm -f /var/www/app/public/main.*
RUN rm -f /var/www/app/public/flutter* RUN rm -f /var/www/app/public/flutter*
@@ -99,6 +101,8 @@ RUN addgroup --gid=$UID -S "$INVOICENINJA_USER" \
--ingroup "$INVOICENINJA_USER" \ --ingroup "$INVOICENINJA_USER" \
"$INVOICENINJA_USER" "$INVOICENINJA_USER"
WORKDIR /var/www/app
# Set up app # Set up app
ARG INVOICENINJA_VERSION ARG INVOICENINJA_VERSION
ARG BAK_STORAGE_PATH ARG BAK_STORAGE_PATH
@@ -110,6 +114,7 @@ COPY --from=nodebuild --chown=$INVOICENINJA_USER:$INVOICENINJA_USER /var/www/app
RUN rm -f /var/www/app/public/main.* RUN rm -f /var/www/app/public/main.*
RUN rm -f /var/www/app/public/flutter* RUN rm -f /var/www/app/public/flutter*
RUN rm -rf /var/www/app/ui
USER $UID USER $UID
WORKDIR /var/www/app WORKDIR /var/www/app
@@ -119,24 +124,29 @@ ENV IS_DOCKER true
# RUN /usr/local/bin/composer install --no-dev --no-scripts --no-interaction # RUN /usr/local/bin/composer install --no-dev --no-scripts --no-interaction
# RUN /usr/local/bin/composer dump-autoload --optimize --no-dev --classmap-authoritative --no-scripts --no-interaction # RUN /usr/local/bin/composer dump-autoload --optimize --no-dev --classmap-authoritative --no-scripts --no-interaction
# FROM --platform=$BUILDPLATFORM nodebuild AS dependencybuild FROM --platform=$BUILDPLATFORM nodebuild AS dependencybuild
# WORKDIR /var/www/app WORKDIR /var/www/app
# COPY --from=phpbuild /var/www/app/vendor /var/www/app/vendor # COPY --from=phpbuild /var/www/app/vendor /var/www/app/vendor
COPY --from=phpbuild /var/www/app /var/www/app
# # Install node packages # # Install node packages
# ARG BAK_STORAGE_PATH ARG BAK_STORAGE_PATH
# ARG BAK_PUBLIC_PATH ARG BAK_PUBLIC_PATH
# RUN --mount=target=/var/www/app/node_modules,type=cache \ # RUN --mount=target=/var/www/app/node_modules,type=cache \
# npm install \ # npm install \
# && npm run production \ # && npm run production \
# && mv /var/www/app/storage $BAK_STORAGE_PATH \ # && mv /var/www/app/storage $BAK_STORAGE_PATH \
# && mv /var/www/app/public $BAK_PUBLIC_PATH # && mv /var/www/app/public $BAK_PUBLIC_PATH
RUN mv /var/www/app/storage $BAK_STORAGE_PATH \
&& mv /var/www/app/public $BAK_PUBLIC_PATH
FROM phpbuild as prod FROM phpbuild as prod
# COPY --from=dependencybuild --chown=$INVOICENINJA_USER:$INVOICENINJA_USER /var/www/app /var/www/app COPY --from=dependencybuild --chown=$INVOICENINJA_USER:$INVOICENINJA_USER /var/www/app /var/www/app
# Override the environment settings from projects .env file # Override the environment settings from projects .env file
ENV APP_ENV production ENV APP_ENV production

1
alpine/5/rootfs/docker-entrypoint-init.d/10-init-in.sh
View File

@@ -12,4 +12,3 @@ if [[ ! -z "${IN_PASSWORD}" ]]; then
fi fi
php artisan ninja:create-account $email $password php artisan ninja:create-account $email $password
php artisan ninja:react

1
alpine/5/rootfs/usr/local/bin/invoiceninja-init.sh
View File

@@ -28,7 +28,6 @@ docker_process_init_files() {
php artisan config:cache php artisan config:cache
php artisan optimize php artisan optimize
php artisan package:discover php artisan package:discover
php artisan ninja:react
# Check if DB works, if not crash the app. # Check if DB works, if not crash the app.
DB_READY=$(php artisan tinker --execute='echo app()->call("App\Utils\SystemHealth@dbCheck")["success"];') DB_READY=$(php artisan tinker --execute='echo app()->call("App\Utils\SystemHealth@dbCheck")["success"];')

2
config/nginx/in-vhost.conf
View File

@@ -7,7 +7,7 @@ server {
client_max_body_size 100M; client_max_body_size 100M;
root /var/www/app/public/; root /var/www/app/public/;
index index.php; index index.html index.htm index.php;
location / { location / {
try_files $uri $uri/ /index.php?$query_string; try_files $uri $uri/ /index.php?$query_string;