Developing

.github/workflows/CICD.yml

@@ -1,5 +1,6 @@
 name: CICD Pipeline
 
+
 on:
   push:
     paths:
@@ -107,6 +108,14 @@ jobs:
         github.ref_name == 'main' && 'Prod' ||
         github.base_ref == 'developing' && 'Dev' ||
         github.ref_name == 'developing' && 'Dev'}}
+    env:
+      environment: ${{
+        github.base_ref == 'main' && 'Prod' ||
+        github.ref_name == 'main' && 'Prod' ||
+        github.base_ref == 'developing' && 'Dev' ||
+        github.ref_name == 'developing' && 'Dev'}}
+      DATABASE_URL: ${{ secrets.DATABASE_URL }}
+
     steps:
       - name: Download image artifact
         uses: actions/download-artifact@v4
@@ -117,11 +126,14 @@ jobs:
         run: |
           gunzip -c image.tar.gz | docker load
 
+      - name: List Docker images
+        run: docker images
+
       - name: Run tests inside Docker
         run: |
-          docker run --rm \
-            -e DATABASE_URL=${{ secrets.DATABASE_URL }} \
-            unimap pytest
+          if [ "$environment" = "Dev" ]; then
+            docker run --rm -e DATABASE_URL="$DATABASE_URL" unimap pytest
+          fi
 
 
   deploy:
@@ -143,7 +155,7 @@ jobs:
       - name: Load Docker image
         run: |
           gunzip -c image.tar.gz | docker load
-
+          
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:
@@ -168,10 +180,10 @@ jobs:
             --comment "Deploy Docker container from GitHub Actions" \
             --targets "Key=InstanceIds,Values=${{ secrets.EC2_INSTANCE_ID }}" \
             --parameters 'commands=[
-              "aws ecr get-login-password --region '${{ secrets.AWS_REGION }}' | docker login --username AWS --password-stdin '${{ secrets.ECR_URI }}'",
-              "docker pull '${{ secrets.ECR_URI }}:latest'",
+              "aws ecr get-login-password --region ${{ secrets.AWS_REGION }} | docker login --username AWS --password-stdin ${{ secrets.ECR_URI }}",
+              "docker pull ${{ secrets.ECR_URI }}:latest",
               "docker stop unimap || true",
               "docker rm unimap || true",
-              "docker run --rm -d --name unimap -e DATABASE_URL='${{ secrets.DATABASE_URL }}' -p 8000:8000 '${{ secrets.ECR_URI }}:latest'"
+              "docker run --rm -d --name unimap -e DATABASE_URL=${{ secrets.DATABASE_URL }} -p 8000:8000 ${{ secrets.ECR_URI }}:latest"
             ]' \
             --region $AWS_REGION