fixed merge conflict

.github/workflows/deploy.yml

@@ -0,0 +1,30 @@
+name: Deployment
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  deploy:
+    runs-on: self-hosted
+    environment:
+      name: production
+      url: https://robotics-club.utm.utoronto.ca/
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: create env files
+        run: echo "${{ secrets.ENV }}" > .env;
+
+      - name: compose build
+        run: docker compose build
+
+      - name: compose up
+        run: docker compose up -d
+
+      - name: cleanup
+        run: |
+          docker system prune -a -f

Dockerfile

@@ -0,0 +1,12 @@
+FROM node:lts
+
+WORKDIR ~/website
+
+RUN npm install -g serve
+COPY package.json package-lock.json ./
+RUN npm ci
+
+COPY . .
+RUN npm run build
+
+CMD [ "serve", "build" ]

docker-compose.yml

@@ -0,0 +1,8 @@
+version: "3"
+services:
+  website:
+    build:
+      dockerfile: Dockerfile
+    ports:
+      - "3000:3000"
+    restart: always