change workflow

Author: AlexBa16

.github/workflows/US1.yml

@@ -15,22 +15,37 @@ on:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build-and-deploy:"
-  build-and-deploy:
-    # The type of runner that the job will run on
+  build:
     runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
+      - name: Build Docker Image
+        run: docker build -t mealplan:staging .
+
+      - 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:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v4
 
-      - name: Docker
+      - name: Deploy to Staging
         run: |
-          docker build -t mealplan:staging .
-          echo "Stoppe alte Container falls vorhanden..."
+          echo "Stopping old containers..."
           docker compose down || true
-          echo "Starte neue Container..."
+          echo "Starting new containers..."
           docker compose up -d --force-recreate
-          echo "Deployment abgeschlossen"
-          docker compose logs --tail=50
+          echo "Deployment finished"
+          docker logs webserver > deployment.log
+
+      - name: Upload Deployment Logs
+        uses: actions/upload-artifact@v4
+        with:
+          name: deployment-logs
+          path: deployment.log

docker-compose.yaml

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

dockerfile

@@ -22,13 +22,13 @@ WORKDIR /var/www/html/
 
 COPY . /var/www/html/ 
 
-RUN rm -f dockerfile
-RUN rm -f docker-compose.yaml
-RUN rm -f 01_webt-adv-ci-cd-mit-github.pdf
+RUN rm dockerfile
+RUN rm docker-compose.yaml
+RUN rm 01_webt-core-docker.md
 RUN composer install
 
 RUN chown -R www-data:www-data *
 
 ENTRYPOINT ["/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
 
-# docker build -t mealplan:staging .
+# docker build -t mealplan:v1 .