From 354cf63f1813e2c353dff1167655dfff639c02d3 Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 17 Oct 2024 19:19:43 +0800 Subject: [PATCH] Optimize Dockerfile and revert to single build platform --- .woodpecker/{.build_arm64.yml => .build.yml} | 0 .woodpecker/.build_x86.yml | 22 -------------------- Dockerfile | 2 +- 3 files changed, 1 insertion(+), 23 deletions(-) rename .woodpecker/{.build_arm64.yml => .build.yml} (100%) delete mode 100644 .woodpecker/.build_x86.yml diff --git a/.woodpecker/.build_arm64.yml b/.woodpecker/.build.yml similarity index 100% rename from .woodpecker/.build_arm64.yml rename to .woodpecker/.build.yml diff --git a/.woodpecker/.build_x86.yml b/.woodpecker/.build_x86.yml deleted file mode 100644 index 67c27c7..0000000 --- a/.woodpecker/.build_x86.yml +++ /dev/null @@ -1,22 +0,0 @@ -labels: - platform: linux/amd64 - -steps: - - name: build - image: docker - when: - - branch: master - event: push - commands: - - docker build -t "$REGISTRY_IMAGE_TAG" . - - echo "$FORGEJO_REGISTRY_PASSWORD" | docker login "$FORGEJO_REGISTRY_URL" --password-stdin -u "$FORGEJO_REGISTRY_USERNAME" - - docker push "$REGISTRY_IMAGE_TAG" - volumes: - - /var/run/docker.sock:/var/run/docker.sock - secrets: - [ - FORGEJO_REGISTRY_URL, - FORGEJO_REGISTRY_USERNAME, - FORGEJO_REGISTRY_PASSWORD, - REGISTRY_IMAGE_TAG, - ] diff --git a/Dockerfile b/Dockerfile index dad8766..2a4b21b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ RUN npm run build FROM nginx:latest RUN rm -rf /usr/share/nginx/html/* -COPY --from=build /usr/local/app/ /usr/share/nginx/html +COPY --from=build /usr/local/app/build/ /usr/share/nginx/html COPY nginx/nginx.conf /etc/nginx/conf.d/default.conf RUN service nginx restart