From b0ebac9719a1d0326cb62186c04bbc702f341d07 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 20 Sep 2023 17:42:31 +1000 Subject: [PATCH 1/3] improve react builds for Docker --- alpine/5/Dockerfile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/alpine/5/Dockerfile b/alpine/5/Dockerfile index b3052f9..94a2a3b 100644 --- a/alpine/5/Dockerfile +++ b/alpine/5/Dockerfile @@ -21,7 +21,14 @@ RUN curl -LGO $(curl https://api.github.com/repos/invoiceninja/ui/releases/lates RUN cp invoiceninja-react.zip /tmp/invoiceninja-react.zip RUN unzip /tmp/invoiceninja-react.zip RUN find /var/www/app/public/react/ -type f -delete -RUN cp -r dist/react/* /var/www/app/public/react/ +RUN cp -r dist/react/* /var/www/app/public/react/ \ + for file in dist/react/* ; do \ + filename=$(basename -- "$file") \ + extension="${filename##*.}" \ + filename="${filename%.*}" \ + version=v$INVOICENINJA_VERSION \ + cp $file ../public/react/$filename"."$version"."$extension \ + done RUN mkdir -p /var/www/app/public/tinymce_6.4.2/tinymce/js/ RUN cp -r dist/tinymce_6.4.2/* /var/www/app/public/tinymce_6.4.2/ From acf9c22ff7525a9bf67699b998afcd9274e5ff46 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 20 Sep 2023 18:16:37 +1000 Subject: [PATCH 2/3] looping in react folder --- alpine/5/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/alpine/5/Dockerfile b/alpine/5/Dockerfile index 94a2a3b..709adbe 100644 --- a/alpine/5/Dockerfile +++ b/alpine/5/Dockerfile @@ -21,14 +21,14 @@ RUN curl -LGO $(curl https://api.github.com/repos/invoiceninja/ui/releases/lates RUN cp invoiceninja-react.zip /tmp/invoiceninja-react.zip RUN unzip /tmp/invoiceninja-react.zip RUN find /var/www/app/public/react/ -type f -delete -RUN cp -r dist/react/* /var/www/app/public/react/ \ - for file in dist/react/* ; do \ +RUN for file in dist/react/* ; do \ filename=$(basename -- "$file") \ extension="${filename##*.}" \ filename="${filename%.*}" \ version=v$INVOICENINJA_VERSION \ cp $file ../public/react/$filename"."$version"."$extension \ - done + done \ + RUN mkdir -p /var/www/app/public/tinymce_6.4.2/tinymce/js/ RUN cp -r dist/tinymce_6.4.2/* /var/www/app/public/tinymce_6.4.2/ From 85d256a43532b057bfaef72cc47d21f7e77fa599 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 20 Sep 2023 22:14:49 +1000 Subject: [PATCH 3/3] Improve react support in dockerfile --- alpine/5/Dockerfile | 9 ++------- alpine/5/loop.sh | 0 2 files changed, 2 insertions(+), 7 deletions(-) create mode 100755 alpine/5/loop.sh diff --git a/alpine/5/Dockerfile b/alpine/5/Dockerfile index 709adbe..9b19334 100644 --- a/alpine/5/Dockerfile +++ b/alpine/5/Dockerfile @@ -21,13 +21,8 @@ RUN curl -LGO $(curl https://api.github.com/repos/invoiceninja/ui/releases/lates RUN cp invoiceninja-react.zip /tmp/invoiceninja-react.zip RUN unzip /tmp/invoiceninja-react.zip RUN find /var/www/app/public/react/ -type f -delete -RUN for file in dist/react/* ; do \ - filename=$(basename -- "$file") \ - extension="${filename##*.}" \ - filename="${filename%.*}" \ - version=v$INVOICENINJA_VERSION \ - cp $file ../public/react/$filename"."$version"."$extension \ - done \ +COPY loop.sh loop.sh +RUN ./loop.sh RUN mkdir -p /var/www/app/public/tinymce_6.4.2/tinymce/js/ RUN cp -r dist/tinymce_6.4.2/* /var/www/app/public/tinymce_6.4.2/ diff --git a/alpine/5/loop.sh b/alpine/5/loop.sh new file mode 100755 index 0000000..e69de29