Put UID back and fix CI to utilize starter site inputs

.github/actions/setup/action.yml

@@ -10,6 +10,7 @@ inputs:
   starter-site-ref:
     description: "islandora-starter-site ref to checkout"
     default: "heads/main"
+
 runs:
   using: "composite"
   steps:
@@ -43,8 +44,10 @@ runs:
       shell: bash
       env:
         ISLANDORA_TAG: ${{ inputs.buildkit-tag }}
+        STARTER_SITE_BRANCH: ${{ inputs.starter-site-ref }}
+        STARTER_SITE_OWNER: ${{ inputs.starter-site-owner }}
         TERM: xterm-256color
-      run: make up
+      run: make overwrite-starter-site init up
 
     - name: make sure traefik is serving traffic
       shell: bash

docker-compose.dev.yml

@@ -3,7 +3,12 @@
 services:
   drupal:
     volumes:
-      - ./drupal/rootfs/var/www/drupal:/var/www/drupal:z,rw,${CONSISTENCY}
+      - ./drupal/rootfs/var/www/drupal/assets:/var/www/drupal/assets:z,rw,${CONSISTENCY}
+      - ./drupal/rootfs/var/www/drupal/composer.json:/var/www/drupal/composer.json:z,rw,${CONSISTENCY}
+      - ./drupal/rootfs/var/www/drupal/composer.lock:/var/www/drupal/composer.lock:z,rw,${CONSISTENCY}
+      - ./drupal/rootfs/var/www/drupal/config:/var/www/drupal/config:z,rw,${CONSISTENCY}
+      - ./drupal/rootfs/var/www/drupal/web/modules/custom:/var/www/drupal/web/modules/custom:z,rw,${CONSISTENCY}
+      - ./drupal/rootfs/var/www/drupal/web/themes/custom:/var/www/drupal/web/themes/custom:z,rw,${CONSISTENCY}
   mariadb:
     ports:
       - "3306:3306"

docker-compose.yml

@@ -30,6 +30,8 @@ secrets:
     file: ./certs/privkey.pem
   CERT_AUTHORITY:
     file: ./certs/rootCA.pem
+  UID:
+    file: ./certs/UID
   # Production secrets:
   ACTIVEMQ_PASSWORD:
     file: "./secrets/ACTIVEMQ_PASSWORD"
@@ -136,6 +138,7 @@ services:
     secrets:
       - source: CERT_PUBLIC_KEY
       - source: CERT_AUTHORITY
+      - source: UID
       - source: DB_ROOT_PASSWORD
       - source: DRUPAL_DEFAULT_ACCOUNT_PASSWORD
       - source: DRUPAL_DEFAULT_DB_PASSWORD

sample.env

@@ -29,7 +29,8 @@ REPOSITORY=islandora.io
 # The tag to apply to custom images.
 TAG=local
 
-ISLANDORA_TAG=6.2.8
+# https://github.com/Islandora-Devops/isle-buildkit tag to use
+ISLANDORA_TAG=6.2.9
 
 DOMAIN=islandora.traefik.me
 

scripts/build.sh

@@ -5,19 +5,8 @@ set -eou pipefail
 # shellcheck disable=SC1091
 source "${BASH_SOURCE[0]%/*}/profile.sh"
 
+id -u > ./certs/UID
+
 find drupal/rootfs -type d -exec chmod 755 {} \;
-find drupal/rootfs -type f -exec chmod 644 {} \;
-chmod +x ./drupal/rootfs/etc/s6-overlay/s6-rc.d/install/up \
-         ./drupal/rootfs/etc/s6-overlay/scripts/install.sh
 
 docker compose build
-
-# copy the container drupal root to the host
-# to make editing from the host IDE easy
-if [ "$DEVELOPMENT_ENVIRONMENT" = "true" ]; then
-    rm -rf ./drupal/rootfs/var/www/drupal
-    mkdir -p ./drupal/rootfs/var/www/drupal
-    CONTAINER=$(docker create "${REPOSITORY}/${COMPOSE_PROJECT_NAME}:${TAG}")
-    docker cp "${CONTAINER}:/var/www/drupal/." ./drupal/rootfs/var/www/drupal/
-    docker rm "${CONTAINER}"
-fi

scripts/init.sh

@@ -23,6 +23,6 @@ fi
 
 docker compose run --rm init
 
-chown -R "$(whoami)" ./certs ./secrets || sudo chown -R "$(whoami)" ./certs ./secrets
+chown -R "$(whoami)" ./certs ./secrets > /dev/null 2>&1 || sudo chown -R "$(whoami)" ./certs ./secrets
 
 make build