Replace Nuxt/Express with Sveltekit/Fastify PR #2

.dockerignore

@@ -1,5 +1,12 @@
-node_modules
-.env.example
-.nuxt
-build.sh
-docker-compose-live.yml
+**/node_modules
+.env
+./apps/webstack/.env
+./apps/discordbot/.env
+out
+**/build
+**/.svelte-kit
+**/Dockerfile
+docker-compose-live.yml
+build-bot.sh
+build-web.sh
+.npmrc

.env.example

@@ -1,12 +1,9 @@
-DISCORD_GUILD_ID=
 DISCORD_CLIENT_ID=
+PUBLIC_DISCORD_CALLBACK_URL=
 DISCORD_CLIENT_SECRET=
-DISCORD_CALLBACK_URL=
 DISCORD_BOT_TOKEN=
-OSU2_CLIENT_ID=
+DISCORD_GUILD_ID=
+PUBLIC_OSU2_CLIENT_ID=
 OSU2_CLIENT_SECRET=
-OSU2_CALLBACK_URL=
-COOKIE_SECURE=1
-COOKIE_SECRET=keyboard_cat
-REDIS_HOST=
-REDIS_PORT=
+PUBLIC_OSU2_CALLBACK_URL=
+PRIVATE_COOKIE_SECRET=

.github/workflows/oth-live-docker-image.yml

@@ -0,0 +1,92 @@
+name: Build and push images for osu! tournament hub deployments
+
+on:
+  push:
+    branches: ["oth-live"]
+
+env:
+  # Use docker.io for Docker Hub if empty
+  REGISTRY: amu.subject.moe
+  # github.repository as <account>/<repo>
+  WEB_IMAGE: cosette-lite
+  BOT_IMAGE: cosette-bot
+  GITLAB_USER: subject
+
+jobs:
+  build-web:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v2
+
+      # Login against a Docker registry except on PR
+      # https://github.com/docker/login-action
+      - name: Log into registry ${{ env.REGISTRY }}
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ env.GITLAB_USER }}
+          password: ${{ secrets.GITLAB_REGISTRY_TOKEN }}
+
+      # Extract metadata (tags, labels) for Docker
+      # https://github.com/docker/metadata-action
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/[email protected]
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.GITLAB_USER }}/oth-verification/${{ env.WEB_IMAGE }}
+
+      # Build and push Docker image with Buildx (don't push on PR)
+      # https://github.com/docker/build-push-action
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./apps/webstack/Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+  build-bot:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v2
+
+      # Login against a Docker registry except on PR
+      # https://github.com/docker/login-action
+      - name: Log into registry ${{ env.REGISTRY }}
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ env.GITLAB_USER }}
+          password: ${{ secrets.GITLAB_REGISTRY_TOKEN }}
+
+      # Extract metadata (tags, labels) for Docker
+      # https://github.com/docker/metadata-action
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/[email protected]
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.GITLAB_USER }}/oth-verification/${{ env.BOT_IMAGE }}
+
+      # Build and push Docker image with Buildx (don't push on PR)
+      # https://github.com/docker/build-push-action
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./apps/discordbot/Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.gitignore

@@ -62,21 +62,6 @@ typings/
 # parcel-bundler cache (https://parceljs.org/)
 .cache
 
-# next.js build output
-.next
-
-# nuxt.js build output
-.nuxt
-
-# Nuxt generate
-dist
-
-# vuepress build output
-.vuepress/dist
-
-# Serverless directories
-.serverless
-
 # IDE / Editor
 .idea
 
@@ -89,6 +74,12 @@ sw.*
 # Vim swap files
 *.swp
 
-.env
+*/.env
+*/.env.backup
 server/cert/*.pem
-docker-compose-live.yml
+*docker-compose-live.yml
+.svelte-kit
+build/
+config.json
+*out
+docker-compose-staging.yml

.npmrc

@@ -0,0 +1,2 @@
+engine-strict=true
+use-node-version=18.13.0