Optimize Dockerfile and revert to single build platform

This commit is contained in:
Keannu Bernasol 2024-10-17 19:19:43 +08:00
parent 4fe861d2cc
commit 354cf63f18
3 changed files with 1 additions and 23 deletions

View file

@ -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,
]

View file

@ -7,7 +7,7 @@ RUN npm run build
FROM nginx:latest FROM nginx:latest
RUN rm -rf /usr/share/nginx/html/* 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 COPY nginx/nginx.conf /etc/nginx/conf.d/default.conf
RUN service nginx restart RUN service nginx restart