Compare commits

...

4 Commits

Author SHA1 Message Date
David Bomba
dafd4051d3 Merge pull request #572 from turbo124/master
Updates for react release
2024-04-05 08:45:27 +11:00
David Bomba
c6b44487f3 Updates for react release 2024-04-05 08:45:03 +11:00
David Bomba
b2e03ce544 Merge pull request #570 from turbo124/master
Rollback copy
2024-04-05 07:29:10 +11:00
David Bomba
78fd70118a Rollback copy 2024-04-05 07:28:47 +11:00
2 changed files with 4 additions and 5 deletions

View File

@@ -18,8 +18,9 @@ RUN mkdir -p /var/www/app \
WORKDIR /var/www/app
RUN rm -f /var/www/app/public/main.*
RUN rm -f /var/www/app/public/flutter*
RUN echo ls -l
RUN cp /var/www/app/ui/dist/index.html /var/www/app/resources/views/react/index.blade.php
# Prepare php image
FROM php:${PHP_VERSION}-fpm-alpine as phpbuild
@@ -83,8 +84,6 @@ ENV BAK_STORAGE_PATH $BAK_STORAGE_PATH
ENV BAK_PUBLIC_PATH $BAK_PUBLIC_PATH
COPY --from=nodebuild --chown=$INVOICENINJA_USER:$INVOICENINJA_USER /var/www/app /var/www/app
RUN rm -f /var/www/app/public/main.*
RUN rm -f /var/www/app/public/flutter*
RUN rm -rf /var/www/app/ui
USER $UID

View File

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