unify use of static drupal image for local and static builds

Author: Tim Martin

Dockerfile

@@ -1,28 +1,19 @@
 # syntax=docker/dockerfile:experimental
+# Dockerfile for drupal-static build
+
 ARG REPOSITORY
 ARG TAG
 FROM ${REPOSITORY}/drupal:${TAG}
 
-COPY --chown=0:0 rootfs /
-COPY --chown=nginx:www-data codebase /var/www/drupal/
-
 USER nginx
-RUN echo "Creating tmp directory " && \
-    mkdir -m 0775 -p /var/www/drupal/web/sites/default/files/tmp && \
-    mkdir -m 0755 -p /tmp/private && \
-    echo "Copy Generic File" && \
-    if [ ! -f web/sites/default/files/generic.png ] ; then \
-      cp "web/core/modules/media/images/icons/generic.png" "web/sites/default/files/generic.png" ; \
-    fi
-
-USER root
-# Final permissions sets:
-RUN bash /var/www/drupal/fix_permissions.sh /var/www/drupal/web nginx
 
 # Run composer install as application user:
-USER nginx
-RUN COMPOSER_MEMORY_LIMIT=-1 COMPOSER_DISCARD_CHANGES=true composer install --no-interaction --no-progress
-
-# Normal startup (via /init) must happen as root:
+# Normal startup (via /init) must also happen as root
 USER root
+COPY --chown=nginx:www-data codebase /var/www/drupal/
+COPY --chown=0:0 rootfs /
+
+RUN COMPOSER_MEMORY_LIMIT=-1 COMPOSER_DISCARD_CHANGES=true composer install --no-interaction --no-progress && \
+    chmod 0750 /var/www/drupal/fix_permissions.sh && \
+    /var/www/drupal/fix_permissions.sh /var/www/drupal/web nginx
 

codebase/fix_permissions.sh

@@ -17,11 +17,13 @@ echo -e $help
 exit
 fi
 
-cd $path
-
 set -e
-#CHMOD="echo /bin/chmod"
-CHMOD="/bin/chmod -v"
+
+### IDC Customizations below here to remove multiple recursive find commands:
+
+CHMOD="/bin/chmod"
+
+cd $path
 
 echo -e "Fixing directory permissions beneath '$path'"
 find . -type d \( \
@@ -39,22 +41,3 @@ find . -type f \( \
      #> /tmp/fix_permissions-files.log
 
 exit 0
-
-# This is now performed in the Docker COPY layer:
-#echo -e "Changing ownership of all contents of \"${path}\" :\n user => \"${user}\" \t group => \"${group}\"\n"
-#chown -R ${user}:${group} .
-
-# Replaced by above finds:
-#echo "Changing permissions of all directories inside \"${path}\" to \"750\"..."
-#1 find . -type d -exec chmod u=rwx,g=rx,o= {} \;
-#echo -e "Changing permissions of all files inside \"${path}\" to \"640\"...\n"
-#2 find . -type f -exec chmod u=rw,g=r,o= {} \;
-#
-#cd $path/sites;
-#
-#echo "Changing permissions of \"files\" directories in \"${path}/sites\" to \"770\"..."
-#3 find . -type d -name files -exec chmod ug=rwx,o= '{}' \;
-#echo "Changing permissions of all files inside all \"files\" directories in \"${path}/sites\" to \"660\"..."
-#4 find . -name files -type d -exec find '{}' -type f \; | while read FILE; do chmod ug=rw,o= "$FILE"; done
-#echo "Changing permissions of all directories inside all \"files\" directories in \"${path}/sites\" to \"770\"..."
-#5 find . -name files -type d -exec find '{}' -type d \; | while read DIR; do chmod ug=rwx,o= "$DIR"; done

codebase/web/sites/default/settings.php

@@ -792,3 +792,14 @@
 if (file_exists($app_root . '/' . $site_path . '/settings.local.php')) {
   include $app_root . '/' . $site_path . '/settings.local.php';
 }
+$settings['config_sync_directory'] = '/var/www/drupal/config/sync';
+$settings['flysystem']['fedora']['driver'] = 'fedora';
+$settings['flysystem']['fedora']['config']['root'] = 'http://fcrepo.isle-dc.localhost/fcrepo/rest/';
+$databases['default']['default']['database'] = 'drupal_default';
+$databases['default']['default']['username'] = 'drupal_default';
+$databases['default']['default']['password'] = 'password';
+$databases['default']['default']['host'] = 'mariadb-idc.traefik.me';
+$databases['default']['default']['port'] = '3306';
+$databases['default']['default']['prefix'] = '';
+$databases['default']['default']['driver'] = 'mysql';
+$databases['default']['default']['namespace'] = 'Drupal\\Core\\Database\\Driver\\mysql';

docker-compose.drupal-dev.yml

@@ -15,7 +15,8 @@ volumes:
   solr-data:
 services:
   drupal:
-    image: ${REPOSITORY:-islandora}/drupal-dev:${TAG:-latest}
+    image: ${REPOSITORY:-islandora}/drupal-dev:static
+    #image: ${REPOSITORY:-islandora}/drupal-dev:${TAG:-latest}
       # Uncomment below to PHP commands executed on container start, or PHP commands (e.g. drush) run from the CLI
       # (significantly slows down the container startup)
       # If debugging container startup is not necessary, consider setting the environment variables within a shell via

docker-compose.local.yml

@@ -15,7 +15,8 @@ volumes:
   solr-data:
 services:
   drupal:
-    image: ${REPOSITORY:-islandora}/drupal:${TAG:-latest}
+    #image: ${REPOSITORY:-islandora}/drupal:${DRUPAL_STATIC_TAG:-${TAG:-latest}}
+    image: ${REPOSITORY:-islandora}/drupal-static:static
     volumes:
       - ./codebase:/var/www/drupal:delegated
       - drupal-sites-data:/var/www/drupal/web/sites/default/files

docker-compose.static.yml

@@ -20,7 +20,8 @@ services:
       args:
         TAG: ${TAG}
         REPOSITORY: ${REPOSITORY}
-    image: ${REPOSITORY}/drupal-static:${DRUPAL_STATIC_TAG}
+    #image: ${REPOSITORY}/drupal-static:${DRUPAL_STATIC_TAG}
+    image: ${REPOSITORY}/drupal-static:static
     environment:
       DRUPAL_INSTANCE: static
     volumes:

idc.Makefile

@@ -102,7 +102,7 @@ snapshot-push:
 
 .PHONY: up
 .SILENT: up
-up:  download-default-certs docker-compose.yml start
+up:  download-default-certs static-drupal-image docker-compose.yml start
 
 .PHONY: down
 .SILENT: down
@@ -163,7 +163,6 @@ start:
 		echo "Pre-existing Drupal state found, not loading db from snapshot"; \
 		${MAKE} _docker-up-and-wait; \
 	fi;
-	-docker-compose exec -T drupal bash -lc "bash /var/www/drupal/scripts/bash/start_up.sh"
 	$(MAKE) solr-cores
 
 .PHONY: _docker-up-and-wait
@@ -193,12 +192,14 @@ static-drupal-image:
 	else \
 		echo "Using existing Drupal image $${EXISTING}" ; \
 	fi
+	docker tag ${REPOSITORY}/drupal-static:${GIT_TAG} ${REPOSITORY}/drupal-static:static
 
 # Export a tar of the static drupal image
 .PHONY: static-drupal-image-export
 .SILENT: static-drupal-image-export
 static-drupal-image-export: static-drupal-image
 	IMAGE=${REPOSITORY}/drupal-static:${GIT_TAG} ; \
+	echo saving docker image $${IMAGE} ; \
 	mkdir -p images ; \
 	docker save $${IMAGE} > images/static-drupal.tar
 
@@ -208,8 +209,8 @@ static-drupal-image-export: static-drupal-image
 .PHONY: static-docker-compose.yml
 .SILENT: static-docker-compose.yml
 static-docker-compose.yml: static-drupal-image
-	ENV_FILE=.env ; \
-	if [ "$(env)" != "" ] ; then ENV_FILE=$(env); fi; \
+	ENV_FILE=.env
+	if [ "$(env)" != "" ] ; then echo inherited environment ; ENV_FILE=$(env); fi; \
 	echo '' > .env_static && \
 		while read line; do \
 		if echo $$line | grep -q "ENVIRONMENT" ; then \
@@ -218,11 +219,24 @@ static-docker-compose.yml: static-drupal-image
 			echo $$line >> .env_static ; \
 		fi \
 		done < $${ENV_FILE} && \
-		echo DRUPAL_STATIC_TAG=${GIT_TAG} >> .env_static
-	mv $${ENV_FILE} .env.bak
-	mv .env_static $${ENV_FILE}
-	$(MAKE) -B docker-compose.yml args="--env-file $${ENV_FILE}" || mv .env.bak $${ENV_FILE}
-	if [ -f .env.bak ] ; then mv .env.bak $${ENV_FILE} ; fi
+                echo setting xxDRUPAL_STATIC_TAG && \
+		echo xxDRUPAL_STATIC_TAG=static >> .env_static
+	mv ${ENV_FILE} .env.bak
+	mv .env_static ${ENV_FILE}
+	echo Building static drupal configuration
+	#grep DRUPAL_STATIC_TAG= ${ENV_FILE}
+	grep ENVIRONMENT= ${ENV_FILE}
+	$(MAKE) -B docker-compose.yml args="--env-file ${ENV_FILE}" || ( echo reverting ${ENV_FILE} ; mv -v .env.bak ${ENV_FILE} )
+
+.SILENT: revert-env
+.PHONY:  revert-env
+
+revert-env:
+	ENV_FILE=.env
+	if [ -f .env.bak ] ; then \
+	  echo reverting ${ENV_FILE} ; \
+	  mv -v .env.bak ${ENV_FILE} ; \
+	fi
 
 .SILENT: test
 .PHONY: test

rootfs/etc/cont-init.d/04-custom-setup.sh

@@ -25,28 +25,6 @@ function main {
 
     # Create missing solr cores.
     create_solr_core_with_default_config "${site}"
-
-    # JHU: no triplestore
-    # Create namespace assumed one per site.
-    #create_blazegraph_namespace_with_default_properties "${site}"
-
-    # JHU: SKIP BELOW
-exit 0
-
-    # Need to run migration to get expected default content, now that our required services are running.
-    import_islandora_migrations "${site}"
-    # Workaround for this issue (only seems to apply to islandora_fits):
-    # https://www.drupal.org/project/drupal/issues/2914213
-    cat << EOF > /tmp/fix.php
-<?php
-use Drupal\taxonomy\Entity\Term;
-\$term = array_pop(taxonomy_term_load_multiple_by_name('FITS File'));
-\$default = ['uri' => 'https://projects.iq.harvard.edu/fits'];
-\$term->set('field_external_uri', \$default);
-\$term->save();
-EOF
-    drush php:script /tmp/fix.php
-    # Rebuild the cache.
-    drush cr
 }
 main
+exit 0

rootfs/etc/cont-init.d/99-startup.sh

@@ -8,6 +8,18 @@ echo " -              Running a Start up script
 echo " -------------------------------------------------------------------------- "
 echo ""
 
+DRUPAL_DIR=/var/www/drupal
+
+echo "Creating tmp and private directories"
+for d in $DRUPAL_DIR/web/sites/default/files/tmp /tmp/private ; do
+  echo " directory: '$d'"
+  mkdir -m 0775 -p "$d"
+  chown -R nginx:nginx "$d"
+done
+
+chmod 0750 $DRUPAL_DIR/fix_permissions.sh
+$DRUPAL_DIR/fix_permissions.sh $DRUPAL_DIR/web nginx
+
 # This is a workaround for a bug.
 drush cdel core.extension module.search_api_solr_defaults || true
 drush sql-query "DELETE FROM key_value WHERE collection='system.schema' AND name='search_api_solr_defaults';" || true
@@ -17,7 +29,6 @@ drush php-eval "\Drupal::keyValue('system.schema')->delete('matomo')" || true
 drush config:import -y
 
 # Fix for Github runner "the input device is not a TTY" error
-bash /var/www/drupal/fix_permissions.sh /var/www/drupal/web nginx
 drush search-api-solr:install-missing-fieldtypes || true
 drush search-api:rebuild-tracker || true
 drush search-api-solr:finalize-index || true
@@ -31,6 +42,11 @@ drush -d status
 CURRENT_VERSION=$(drush cr && drush core-status --fields=drupal-version | cut -d\: -f2 | sed 's/ //g')
 echo "Current Drupal version: $CURRENT_VERSION"
 
+echo "Copy Generic File"
+if [ ! -f web/sites/default/files/generic.png ] ; then
+  cp "web/core/modules/media/images/icons/generic.png" "web/sites/default/files/generic.png" 
+fi
+
 echo ""
 echo ""
 echo " -------------------------------------------------------------------------- "