From a0bf43ee0e2f3f767810092ba4ca7071a94a0071 Mon Sep 17 00:00:00 2001 From: aldbr Date: Wed, 6 Nov 2024 13:25:54 +0100 Subject: [PATCH] fix --- .github/workflows/basic.yml | 3 +++ Dockerfile | 2 +- package.json | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml index c98095a..b0e22e0 100644 --- a/.github/workflows/basic.yml +++ b/.github/workflows/basic.yml @@ -39,6 +39,9 @@ jobs: if: github.event_name == 'push' run: npx commitlint --last --verbose + - name: Debug Git + run: git log -n 5 --pretty=oneline + - name: Validate PR commits with commitlint if: github.event_name == 'pull_request' run: npx commitlint --from ${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }} --to ${{ github.event.pull_request.head.sha }} --verbose diff --git a/Dockerfile b/Dockerfile index 7cdbf63..215d5b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,5 +16,5 @@ RUN NEXT_TELEMETRY_DISABLED=1 npm run build # Stage 2: Copy the website from the previous container to a Nginx container FROM nginxinc/nginx-unprivileged:alpine EXPOSE 8080 -COPY --from=build /app/packages/diracx-web/out /usr/share/nginx/html +COPY --from=build /app/out /usr/share/nginx/html COPY ./config/nginx/default.conf /etc/nginx/conf.d/default.conf diff --git a/package.json b/package.json index dedf480..42f75e3 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ }, "scripts": { "dev": "npm --prefix packages/diracx-web run dev", - "build": "npm --prefix packages/diracx-web-components run build && npm --prefix packages/diracx-web run build", + "build": "npm --prefix packages/diracx-web-components run build && npm --prefix packages/diracx-web run build && mv -f packages/diracx-web/out ./out", "test:diracx-web-components": "npm --prefix packages/diracx-web-components run test", "build:diracx-web-components": "npm --prefix packages/diracx-web-components run build", "lint": "npm --prefix packages/diracx-web-components run lint && npm --prefix packages/diracx-web run lint",