Updated static build action

dvsa · Nov 22, 2023 · c4b2c1a · c4b2c1a
1 parent 684e7b4
commit c4b2c1a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.github/actions/build-static/action.yaml b/.github/actions/build-static/action.yaml
@@ -47,13 +47,12 @@ runs:
 
       - name: Build olcs static
         run: |
-          tar -cvzf static.tar.gz public
+         mv public static
         shell: bash
 
       - name: upload staic artifact
         uses: actions/upload-artifact@v3
         with:
           name: olcs-static-artifact
-          path: ./static.tar.gz
+          path: ./static
           retention-days: 1
-
diff --git a/.github/workflows/non-prod-selfserve-web-build-deploy.yaml b/.github/workflows/non-prod-selfserve-web-build-deploy.yaml
@@ -85,7 +85,7 @@ jobs:
     - uses: actions/download-artifact@v3
       with:
         name: olcs-static-artifact
-        path: static.tar.gz
+        path: static
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2

diff --git a/dockerfile b/dockerfile
@@ -22,12 +22,12 @@ COPY php-fpm/php-fpm.d/www.conf /usr/local/etc/php-fpm.d/www.conf
 
 # FROM registry.olcs.dev-dvsacloud.uk/k8s/php:7.4.22-fpm-alpine as intermediate
 
-RUN mkdir -p /opt/dvsa/olcs-frontend /var/log/dvsa /tmp/Entity/Proxy && \
+RUN mkdir -p /opt/dvsa/olcs-frontend/public /var/log/dvsa /tmp/Entity/Proxy && \
     touch /var/log/dvsa/frontend.log
 
 ADD selfserve.tar.gz /opt/dvsa/olcs-frontend
 
-ADD static.tar.gz /opt/dvsa/olcs-frontend/public/static
+COPY static /opt/dvsa/olcs-frontend/public
 
 COPY start.sh /start.sh
 RUN chmod +x /start.sh