Update file paths in github workflows

Author: selfdocumentingcode

.github/workflows/build.yml

@@ -25,10 +25,10 @@ jobs:
       packages: write
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 8.0.x
 
@@ -56,7 +56,7 @@ jobs:
         uses: docker/build-push-action@v5.1.0
         with:
           context: .
-          file: ./docker/Prod.Dockerfile
+          file: ./src/Kattbot/prod.Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/release-v2.yml

@@ -16,7 +16,8 @@ env:
   REGISTRY: ghcr.io
   IMAGE_NAME: kattbot
   COMPOSE_PROJECT_NAME: kattbot
-  COMPOSE_FILE_NAME: prod-compose.yml
+  COMPOSE_FILE_PATH_SRC: docker/docker-compose.prod.yml
+  COMPOSE_FILE_NAME: docker-compose.prod.yml
   DB_NAME: kattbot
   DB_BACKUP_SCRIPT: kattbot-backup-db.sh
   DB_MIGRATION_SCRIPT: database_migration.sql
@@ -61,7 +62,7 @@ jobs:
           username: ${{secrets.KATTBOT_USER}}
           key: ${{secrets.KATTBOT_KEY}}
           passphrase: ${{secrets.KATTBOT_PASSPHRASE}}
-          source: "docker/${{ env.COMPOSE_FILE_NAME }}"
+          source: ${{ env.COMPOSE_FILE_PATH_SRC }}
           target: "$HOME/"
           strip_components: 1
           overwrite: true
@@ -84,13 +85,10 @@ jobs:
           script_stop: true
           script: |
             FULL_IMAGE_NAME="$REGISTRY/$REPOSITORY_NAME/$IMAGE_NAME:$IMAGE_TAG"
-            FULL_IMAGE_NAME_PREVIOUS="$REGISTRY/$REPOSITORY_NAME/$IMAGE_NAME:$IMAGE_TAG-previous"
+            echo "Full image name: $FULL_IMAGE_NAME"
             
             MIGRATIONS_CONTAINER_NAME="$COMPOSE_PROJECT_NAME-migrations"
             
-            # Tag the previous image with the previous tag, if it exists
-            docker image tag $FULL_IMAGE_NAME $FULL_IMAGE_NAME_PREVIOUS || true
-            
             # Pull the image from the registry
             echo $GHCR_PASSWORD | docker login $REGISTRY -u $GHCR_USERNAME --password-stdin
             docker pull $FULL_IMAGE_NAME
@@ -116,6 +114,9 @@ jobs:
             # Run the database migration script
             psql -d $DB_NAME -q -f "$TMP_MIGRATIONS_DIR/$DB_MIGRATION_SCRIPT"
             
+            # Remove the temporary directory
+            rm -rf $TMP_MIGRATIONS_DIR
+            
             # Take down the old compose project, if it exists
             docker compose -p $COMPOSE_PROJECT_NAME down || true
             
@@ -124,9 +125,6 @@ jobs:
             
             # Prune untagged images
             docker image prune -f
-            
-            # Remove the temporary directory
-            rm -rf $TMP_MIGRATIONS_DIR
           envs: >-
             HOST_GATEWAY_IP,
             REGISTRY,