Merge remote-tracking branch 'origin/ssr' into ssr

* origin/ssr:
  Remove build time environment variables
  Comment out early hints
  Build on container start
  Update the PUBLIC_URL domain in dev images
  Update the API domain

.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=
-            VITE_CORELLE_API_DOMAIN=https://rotate.macrostrat.org
-            PUBLIC_URL=/map/
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.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 }}

Dockerfile

@@ -1,30 +1,11 @@
 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
 COPY . ./
 
 RUN yarn cache clean
 RUN yarn add
-RUN yarn run bundle
 
-CMD ["yarn", "run", "server"]
+CMD ["sh", "server/server.sh"]

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');

server/server.sh

@@ -0,0 +1,2 @@
+yarn run bundle
+yarn run server