From ef71e0ebd7ddc36bed08bf52e60661da3eace633 Mon Sep 17 00:00:00 2001 From: Cannon Lock Date: Tue, 26 Sep 2023 11:13:55 -0500 Subject: [PATCH 1/5] Update the API domain --- .github/workflows/build-dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-dev.yaml b/.github/workflows/build-dev.yaml index f32fcd4e..97b8bdb6 100644 --- a/.github/workflows/build-dev.yaml +++ b/.github/workflows/build-dev.yaml @@ -47,7 +47,7 @@ jobs: VITE_MAPBOX_API_TOKEN=${{ secrets.MAPBOX_API_TOKEN }} VITE_MACROSTRAT_TILESERVER_V1=https://tiles.macrostrat.org VITE_MACROSTRAT_TILESERVER_DOMAIN=https://tileserver.macrostrat-dev.chtc.io - VITE_MACROSTRAT_API_DOMAIN= + VITE_MACROSTRAT_API_DOMAIN=https://macrostrat.macrostrat-dev.chtc.io/ VITE_CORELLE_API_DOMAIN=https://rotate.macrostrat.org PUBLIC_URL=/map/ tags: ${{ steps.meta.outputs.tags }} From 22d4373cb4f4f8f5443f645bdc25e2611a2053b1 Mon Sep 17 00:00:00 2001 From: Cannon Lock Date: Tue, 26 Sep 2023 11:25:13 -0500 Subject: [PATCH 2/5] Update the PUBLIC_URL domain in dev images --- .github/workflows/build-dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-dev.yaml b/.github/workflows/build-dev.yaml index 97b8bdb6..e2aca344 100644 --- a/.github/workflows/build-dev.yaml +++ b/.github/workflows/build-dev.yaml @@ -49,6 +49,6 @@ jobs: VITE_MACROSTRAT_TILESERVER_DOMAIN=https://tileserver.macrostrat-dev.chtc.io VITE_MACROSTRAT_API_DOMAIN=https://macrostrat.macrostrat-dev.chtc.io/ VITE_CORELLE_API_DOMAIN=https://rotate.macrostrat.org - PUBLIC_URL=/map/ + PUBLIC_URL=/ tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} From 32d5159188cd61b9793f62bc43af7b3bc0230804 Mon Sep 17 00:00:00 2001 From: Cannon Lock Date: Thu, 28 Sep 2023 14:57:50 -0500 Subject: [PATCH 3/5] Build on container start --- Dockerfile | 3 +-- server/server.sh | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 server/server.sh diff --git a/Dockerfile b/Dockerfile index 7e9d0d19..bd9c9dde 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,6 +25,5 @@ COPY . ./ RUN yarn cache clean RUN yarn add -RUN yarn run bundle -CMD ["yarn", "run", "server"] +CMD ["sh", "server/server.sh"] diff --git a/server/server.sh b/server/server.sh new file mode 100644 index 00000000..866a1013 --- /dev/null +++ b/server/server.sh @@ -0,0 +1,2 @@ +yarn run bundle +yarn run server \ No newline at end of file From 6a60b725b75470cf746ab64a7e1132901dad6bed Mon Sep 17 00:00:00 2001 From: Cannon Lock Date: Thu, 28 Sep 2023 15:00:18 -0500 Subject: [PATCH 4/5] Comment out early hints --- server/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/index.js b/server/index.js index 05320921..0a9e24ce 100644 --- a/server/index.js +++ b/server/index.js @@ -56,7 +56,7 @@ async function startServer() { return next() } else { const { body, statusCode, headers, earlyHints } = httpResponse - if (res.writeEarlyHints) res.writeEarlyHints({ link: earlyHints.map((e) => e.earlyHintLink) }) + // if (res.writeEarlyHints) res.writeEarlyHints({ link: earlyHints.map((e) => e.earlyHintLink) }) headers.forEach(([name, value]) => res.setHeader(name, value)) res.status(statusCode) if (!res.hasHeader('Content-Type')) res.setHeader('Content-Type', 'text/html'); From 07f298f78e4c6948bde2584fb29b455f97ba1da8 Mon Sep 17 00:00:00 2001 From: Cannon Lock Date: Thu, 28 Sep 2023 15:00:47 -0500 Subject: [PATCH 5/5] Remove build time environment variables --- .github/workflows/build-dev.yaml | 7 ------- .github/workflows/build-prod.yaml | 7 ------- Dockerfile | 18 ------------------ 3 files changed, 32 deletions(-) diff --git a/.github/workflows/build-dev.yaml b/.github/workflows/build-dev.yaml index e2aca344..eb0c4798 100644 --- a/.github/workflows/build-dev.yaml +++ b/.github/workflows/build-dev.yaml @@ -43,12 +43,5 @@ jobs: with: context: . push: true - build-args: | - VITE_MAPBOX_API_TOKEN=${{ secrets.MAPBOX_API_TOKEN }} - VITE_MACROSTRAT_TILESERVER_V1=https://tiles.macrostrat.org - VITE_MACROSTRAT_TILESERVER_DOMAIN=https://tileserver.macrostrat-dev.chtc.io - VITE_MACROSTRAT_API_DOMAIN=https://macrostrat.macrostrat-dev.chtc.io/ - VITE_CORELLE_API_DOMAIN=https://rotate.macrostrat.org - PUBLIC_URL=/ tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/build-prod.yaml b/.github/workflows/build-prod.yaml index 873bca1d..1b3df76f 100644 --- a/.github/workflows/build-prod.yaml +++ b/.github/workflows/build-prod.yaml @@ -39,13 +39,6 @@ jobs: uses: docker/build-push-action@v3 with: context: . - build-args: | - VITE_MAPBOX_API_TOKEN=${{ secrets.MAPBOX_API_TOKEN }} - VITE_MACROSTRAT_TILESERVER_V1=https://tiles.macrostrat.org - VITE_MACROSTRAT_TILESERVER_DOMAIN=https://tileserver.macrostrat-dev.chtc.io - VITE_MACROSTRAT_API_DOMAIN= - VITE_CORELLE_API_DOMAIN=https://rotate.macrostrat.org - PUBLIC_URL=/map/ push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/Dockerfile b/Dockerfile index bd9c9dde..956ec398 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,5 @@ FROM node:20 AS build -ARG VITE_MAPBOX_API_TOKEN -ENV VITE_MAPBOX_API_TOKEN=$VITE_MAPBOX_API_TOKEN - -ARG VITE_MACROSTRAT_TILESERVER_V2 -ENV VITE_MACROSTRAT_TILESERVER_V2=$VITE_MACROSTRAT_TILESERVER_V2 - -ARG VITE_MACROSTRAT_TILESERVER_V1 -ENV VITE_MACROSTRAT_TILESERVER_V1=$VITE_MACROSTRAT_TILESERVER_V1 - -ARG VITE_MACROSTRAT_TILESERVER_DOMAIN -ENV VITE_MACROSTRAT_TILESERVER_DOMAIN=$VITE_MACROSTRAT_TILESERVER_DOMAIN - -ARG VITE_MACROSTRAT_API_DOMAIN -ENV VITE_MACROSTRAT_API_DOMAIN=$VITE_MACROSTRAT_API_DOMAIN - -ARG VITE_CORELLE_API_DOMAIN -ENV VITE_CORELLE_API_DOMAIN=$VITE_CORELLE_API_DOMAIN - ENV NODE_ENV=production WORKDIR /usr/src/app