change image name

Author: AlexBa16

.github/workflows/US1.yml

@@ -15,25 +15,13 @@ on:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  build:
+  build-and-deploy:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
       - name: Build Docker Image
-        run: docker build -t mealplan:v1 .
-
-      - name: Run Tests
-        run: |
-          echo "Running tests..."
-          # Replace with your actual test command, e.g. pytest, npm test, etc.
-          echo "Tests passed!"
-
-  deploy:
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - uses: actions/checkout@v4
+        run: docker build -t mealplan:staging .
 
       - name: Deploy to Staging
         run: |
@@ -45,7 +33,5 @@ jobs:
           docker logs webserver > deployment.log
 
       - name: Upload Deployment Logs
-        uses: actions/upload-artifact@v4
-        with:
-          name: deployment-logs
-          path: deployment.log
+        run: |
+          echo deployment.log

docker-compose.yaml

@@ -1,7 +1,7 @@
 services:
   app:
     container_name: webserver
-    image: mealplan:v1
+    image: mealplan:staging
     ports:
       - 80:80
     volumes:

dockerfile

@@ -31,4 +31,4 @@ RUN chown -R www-data:www-data *
 
 ENTRYPOINT ["/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
 
-# docker build -t mealplan:v1 .
+# docker build -t mealplan:staging .