Revert "Reverting accidental pushes from git"

.github/workflows/dockerBuildAndDeploy.yaml

@@ -1,41 +1,41 @@
-name: Create and publish the Docker image
-on:
-  push:
-    branches: ['main']
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-jobs:
-  build-and-push-image:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-      - name: Build and push client Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: ./client
-          push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:client
-          labels: ${{ steps.meta.outputs.labels }}
-      - name: Build and push server Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: ./server
-          push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:server
-          labels: ${{ steps.meta.outputs.labels }}
+name: Create and publish the Docker image
+on:
+  push:
+    branches: ['main']
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+      - name: Build and push client Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: ./client
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:client
+          labels: ${{ steps.meta.outputs.labels }}
+      - name: Build and push server Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: ./server
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:server
+          labels: ${{ steps.meta.outputs.labels }}

docker-compose-images.yml

@@ -1,10 +1,10 @@
-services:
-  frontend:
-    image: ghcr.io/hack4impact-upenn/boilerplate-s2022:client
-    ports:
-      - '3000:3000'
-  backend:
-    image: ghcr.io/hack4impact-upenn/boilerplate-s2022:server
-    ports:
-      - '4000:4000'
-    env_file: ./server/.env
+services:
+  frontend:
+    image: ghcr.io/hack4impact-upenn/boilerplate-s2022:client
+    ports:
+      - "3000:3000"
+  backend:
+    image: ghcr.io/hack4impact-upenn/boilerplate-s2022:server
+    ports:
+      - "4000:4000"
+    env_file: ./server/.env

docker-compose.yml

@@ -1,18 +1,18 @@
-services:
-  frontend:
-    build:
-      context: ./client
-      dockerfile: Dockerfile
-    ports:
-      - '3000:3000'
-    environment:
-      - REACT_APP_BACKEND_URL=http://localhost:4000
-  backend:
-    build:
-      context: ./server
-      dockerfile: Dockerfile
-    ports:
-      - '4000:4000'
-    env_file: ./server/.env
-    environment:
-      - FRONTEND_URL=http://localhost:3000
+services:
+  frontend:
+    build:
+      context: ./client
+      dockerfile: Dockerfile
+    ports:
+      - "3000:3000"
+    environment:
+      - REACT_APP_BACKEND_URL=http://localhost:4000
+  backend:
+    build:
+      context: ./server
+      dockerfile: Dockerfile
+    ports:
+      - "4000:4000"
+    env_file: ./server/.env
+    environment:
+      - FRONTEND_URL=http://localhost:3000