From e4a76ed058cbadfd1a8e59af5eca9178dd00e2db Mon Sep 17 00:00:00 2001 From: Whitewater Date: Fri, 23 Sep 2022 17:31:26 +0800 Subject: [PATCH] Fix/ci (#3) * fix: ci * chore: test ci * fix: ci * feat: add nginx conf * chore: remove debug --- .github/deployment/Dockerfile | 5 +++++ .github/deployment/nginx.conf | 28 ++++++++++++++++++++++++++++ .github/workflows/build.yml | 2 ++ Dockerfile | 2 -- 4 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 .github/deployment/Dockerfile create mode 100644 .github/deployment/nginx.conf delete mode 100644 Dockerfile diff --git a/.github/deployment/Dockerfile b/.github/deployment/Dockerfile new file mode 100644 index 0000000000..95ea5f87c5 --- /dev/null +++ b/.github/deployment/Dockerfile @@ -0,0 +1,5 @@ +FROM nginx:alpine + +COPY ./out /usr/share/nginx/html + +COPY ./.github/deployment/nginx.conf /etc/nginx/conf.d/default.conf diff --git a/.github/deployment/nginx.conf b/.github/deployment/nginx.conf new file mode 100644 index 0000000000..22997cb864 --- /dev/null +++ b/.github/deployment/nginx.conf @@ -0,0 +1,28 @@ +server { + listen 80; + listen [::]:80; + server_name localhost; + + #access_log /var/log/nginx/host.access.log main; + + root /usr/share/nginx/html; + index index.html index.htm; + + location /_next/static { + add_header Cache-Control "max-age=31536000"; + } + + location / { + try_files $uri $uri.html /$uri /index.html + add_header Cache-Control "no-cache"; + } + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } +} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a2b3bfa17a..ac94d08c17 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -85,6 +85,7 @@ jobs: - name: Download artifact uses: actions/download-artifact@v3 with: + name: artifact path: out/ - name: Log in to Docker Hub @@ -105,5 +106,6 @@ jobs: with: context: . push: true + file: ./.github/deployment/Dockerfile tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index d590934715..0000000000 --- a/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM nginx:alpine -COPY ./out /usr/share/nginx/html