Merge branch 'main' into launch

.env

@@ -1 +1,2 @@
 SERVICE_NAME=adventure
+SUBDOMAIN=aoc

.github/workflows/main.yaml

@@ -3,7 +3,7 @@ name: Docker
 on:
   workflow_dispatch:
   push:
-    # Publish `master` as Docker `latest` image.
+    # Publish `main` as Docker `latest` image.
     branches:
       - main
 
@@ -19,17 +19,17 @@ jobs:
       - name: Build image
         run: |
           source .env
-          docker build . --file Dockerfile --tag service-$SERVICE_NAME
+          docker build . --file Dockerfile --tag service-${SERVICE_NAME}
 
       - name: Log into registry
         run: echo "${{ secrets.PAT }}" | docker login ghcr.io -u compsoc-service --password-stdin
 
       - name: Push image
         run: |
           source .env
-          IMAGE_ID=ghcr.io/compsoc-edinburgh/service-$SERVICE_NAME
-          docker tag service-$SERVICE_NAME $IMAGE_ID:latest
-          docker tag service-$SERVICE_NAME $IMAGE_ID:${{ github.sha }}
+          IMAGE_ID=ghcr.io/compsoc-edinburgh/service-${SERVICE_NAME}
+          docker tag service-${SERVICE_NAME} $IMAGE_ID:latest
+          docker tag service-${SERVICE_NAME} $IMAGE_ID:${{ github.sha }}
           docker push $IMAGE_ID:${{ github.sha }}
           docker push $IMAGE_ID:latest
       - name: Trigger update

.open-port

@@ -0,0 +1 @@
+46651

Makefile

@@ -23,7 +23,7 @@ sync-secrets-confirm:
 
 # After cloning this repo locally, you can run this to set up the .secrets
 # directory both locally and remotely. Harmless even if run multiple times.
-initialise: initialise-confirm
+initialise: initialise-confirm generate-port
 	rsync -r ${REMOTE}:/secrets/service-${SERVICE_NAME}/ ./.secrets/
 
 generate-port:
@@ -46,12 +46,10 @@ start:
 	ssh ${REMOTE} 'docker run -d --name service-${SERVICE_NAME} \
 		--network traefik-net \
 		--label "traefik.enable=true" \
-		-p ${PORT}:${PORT} \
-		--env-file /secrets/service-${SERVICE_NAME}/.env \
+		-p ${PORT}:8080 \
 		--volume /deployment/service-${SERVICE_NAME}:/etc/${SERVICE_NAME} \
 		--label "com.centurylinklabs.watchtower.enable=true" \
 		--label "traefik.http.routers.service-${SERVICE_NAME}.rule=Host(\`${SUBDOMAIN}.dev.comp-soc.com\`)" \
-		--label "traefik.http.routers.service-${SERVICE_NAME}.middlewares=traefik-forward-auth-gh" \
 		ghcr.io/compsoc-edinburgh/service-${SERVICE_NAME}'
 
 # Most used command, restarts the service after syncing secrets (i.e. new