continued

Author: mkalkbrenner

.github/workflows/docker_image.yml

@@ -1,16 +1,18 @@
-name: Build Docker Image
+name: Build and Publish Docker Image
 
 on:
   push:
     branches:
       - main
       - docker
+    tags:
+      - 'v*'
   pull_request:
     branches:
       - main
 
 jobs:
-  build-docker-artifact:
+  build-docker-image:
     runs-on: ubuntu-latest
 
     steps:
@@ -22,14 +24,31 @@ jobs:
 
       - name: Build Docker image
         run: |
-          docker build -f docker/Dockerfile -t ppuc-config-tool:latest .
+          docker build -f docker/Dockerfile -t config-tool:latest .
 
       - name: Save Docker image to tar file
         run: |
-          docker save ppuc-config-tool:latest -o ppuc-config-tool.tar
+          docker save config-tool:latest -o config-tool.tar
 
       - name: Upload Docker image artifact
         uses: actions/upload-artifact@v4
         with:
-          name: ppuc-config-tool-image
-          path: ppuc-config-tool.tar
+          name: config-tool-image
+          path: config-tool.tar
+
+      - name: Log in to GitHub Container Registry
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Tag and Push Docker image to GitHub Packages
+        if: startsWith(github.ref, 'refs/tags/v')
+        run: |
+          VERSION=${GITHUB_REF#refs/tags/}
+          docker tag config-tool:latest ghcr.io/${{ github.repository_owner }}/config-tool:${VERSION}
+          docker tag config-tool:latest ghcr.io/${{ github.repository_owner }}/config-tool:latest
+          docker push ghcr.io/${{ github.repository_owner }}/config-tool:${VERSION}
+          docker push ghcr.io/${{ github.repository_owner }}/config-tool:latest

docker/entrypoint.sh

@@ -2,7 +2,7 @@
 set -e
 
 # Paths
-PERSIST_DIR=/var/www/html/drupal-persist
+PERSIST_DIR=/var/www/html/config-tool-data
 DB_PATH=${PERSIST_DIR}/db/.ht.sqlite
 DRUSH=/var/www/vendor/bin/drush
 
@@ -33,7 +33,15 @@ if [ ! -f "${DB_PATH}" ]; then
 
   echo \"PPUC Config Tool installation completed.\"
 else
-  echo \"Existing DB found — skipping install.\"
+  echo \"Existing DB found - check for updates\"
+
+  ${DRUSH} deploy
+
+  ${DRUSH} dcdi \
+    --folder=sites/default/files/default_content \
+    --preserve-ids \
+    --force-override \
+    --yes
 fi
 
 exec apache2-foreground

web/sites/default/settings.php

@@ -861,10 +861,10 @@
 else if (getenv('DRUPAL_DOCKER') === '1') {
   $databases['default']['default'] = [
     'driver' => 'sqlite',
-    'database' => '/var/www/html/drupal-persist/db/.ht.sqlite',
+    'database' => '/var/www/html/config-tool-data/db/.ht.sqlite',
   ];
 
-  $config['file_public_path'] = 'drupal-persist/files';
+  $config['file_public_path'] = 'config-tool-data/files';
 }
 
 /**