From bc23eb3a10d03110eda3ec0420fbc86e2725212e Mon Sep 17 00:00:00 2001 From: Freyja Odinthrir Date: Thu, 8 Feb 2024 15:07:56 -0800 Subject: [PATCH] fix please? maybe? --- .docker/Dockerfile | 2 +- .gitea/workflows/deploy.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index a154703..3df2594 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -8,7 +8,7 @@ FROM alpine:3.17 RUN apk add nginx supervisor RUN mkdir -p /var/www RUN rm -rf /etc/nginx -COPY ../dist /var/www/build +COPY ../build /var/www/build COPY .conf/nginx /etc/nginx COPY .conf/supervisor/supervisord.conf /etc/supervisor/conf.d/supervisord.conf CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"] diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index e88efb0..2d5c1a1 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -47,7 +47,7 @@ jobs: apt upgrade -y apt install -y graphicsmagick p7zip-full - - name: Use Node.js ${{ matrix.node-version }} + name: Use Node.js uses: actions/setup-node@v2 with: node-version: '14' @@ -62,7 +62,7 @@ jobs: run: npm run build - name: Copy dist to docker... - run: npm cache clean --force;cp -a dist docker/ + run: npm cache clean --force;mv dist docker/build - name: Build and push docker image to gitea package store uses: docker/build-push-action@v5