From c4b2c1a7d40e17f0c4a81d6c81e49bde944992e6 Mon Sep 17 00:00:00 2001 From: awshuss Date: Wed, 22 Nov 2023 10:50:57 +0000 Subject: [PATCH] Updated static build action --- .github/actions/build-static/action.yaml | 5 ++--- .github/workflows/non-prod-selfserve-web-build-deploy.yaml | 2 +- dockerfile | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/actions/build-static/action.yaml b/.github/actions/build-static/action.yaml index 4c7bf18a2..3b4d558cc 100644 --- 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 index 918829011..ec0c65d0b 100644 --- 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 index 47ff568fd..f15bb31af 100644 --- 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