Merge pull request #407 from TosiDrop/master

3.1.0 Release

.github/workflows/ci-js.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16.x, 17.x]
+        node-version: [18.x]
         target: [client, server]
     steps:
       - uses: actions/checkout@v2

.github/workflows/publish.yml

@@ -71,6 +71,15 @@ jobs:
         run: |
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+      # TEMP fix
+      # Something strange is happening with the manifests when we push which
+      # breaks the downstream multi-arch-manifest, so pull and push to work
+      # around this by resubmitting manifests
+      - name: pull-and-push
+        run: |
+          for t in `echo '${{ steps.meta-arch.outputs.tags }}'`; do
+            docker pull $t && docker push $t
+          done
 
   build-arm64:
     runs-on: self-hosted
@@ -131,6 +140,15 @@ jobs:
         run: |
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+      # TEMP fix
+      # Something strange is happening with the manifests when we push which
+      # breaks the downstream multi-arch-manifest, so pull and push to work
+      # around this by resubmitting manifests
+      - name: pull-and-push
+        run: |
+          for t in `echo '${{ steps.meta-arch.outputs.tags }}'`; do
+            docker pull $t && docker push $t
+          done
 
   multi-arch-manifest:
     runs-on: ubuntu-latest

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16 AS base
+FROM node:18 AS base
 
 FROM base AS builder
 WORKDIR /code/client
@@ -11,11 +11,15 @@ RUN npm run build
 FROM base AS final
 WORKDIR /app
 COPY --from=builder /code/server/index.ts /code/server/package.json /code/server/tsconfig.json ./server/
+COPY --from=builder /code/server/routes ./server/routes/
+COPY --from=builder /code/server/service ./server/service/
+COPY --from=builder /code/server/types ./server/types/
 COPY --from=builder /code/server/utils ./server/utils/
+COPY --from=builder /code/server/middlewares ./server/middlewares/
 COPY --from=builder /code/server/public ./server/public/
 COPY --from=builder /code/server/node_modules ./server/node_modules/
 COPY --from=builder /code/client/src/entities/ ./client/src/entities/
 COPY --from=builder /code/client/src/services/ ./client/src/services/
 COPY --from=builder /code/client/build/ ./client/build/
 COPY --chmod=555 docker-entrypoint.sh .
-ENTRYPOINT ["/app/docker-entrypoint.sh"]
+ENTRYPOINT ["/app/docker-entrypoint.sh"]