Merge pull request #98 from govCMS/develop

Bring master up to date with develop

Author: steveworley

.docker/Dockerfile.paas

@@ -12,7 +12,8 @@ ARG GOVCMS_GITHUB_TOKEN
 ENV WEBROOT=web
 
 # Clean up base image so as not to conflict with any changes.
-RUN rm -rf /app
+RUN mv /app/web/sites/all/modules /scaffold_modules \
+  && rm -rf /app
 
 RUN composer config --global github-oauth.github.com $GOVCMS_GITHUB_TOKEN
 
@@ -22,6 +23,8 @@ COPY custom /app/custom
 
 # Run composer. Additional `rm`s can be added to reduce the image size, with diminishing returns.
 RUN composer install --no-dev --no-interaction --no-suggest \
+  && mkdir -p /app/web/sites/all \
+  && mv /scaffold_modules /app/web/sites/all/modules \
   && rm -rf ~/.composer/cache \
   && rm -rf /app/web/core/tests \
   && rm -rf /app/web/modules/contrib/webform/tests

.docker/Dockerfile.saasplus

@@ -19,7 +19,9 @@ COPY config /app/config
 COPY favicon.ico /app/web
 
 # To enable SaaS+ uncomment these lines
-RUN composer config --global github-oauth.github.com $GOVCMS_GITHUB_TOKEN
+RUN [ ! -z "$GOVCMS_GITHUB_TOKEN" ] \
+  && composer config --global github-oauth.github.com $GOVCMS_GITHUB_TOKEN \
+  || echo "skipping github token"
 COPY custom /app/custom
 RUN jq -s '.[1].repositories = (.[0].repositories + .[1].repositories) | .[1]' /app/custom/composer/composer.json /app/composer.json > /tmp/composer.json
 RUN mv /tmp/composer.json /app/composer.json

.version.yml

@@ -5,4 +5,4 @@
 # e.g. site audits, automated backups.
 version: {{ GOVCMS_VERSION }}
 type: {{ GOVCMS_TYPE }}
-scaffold: 3.4.0
+scaffold: 3.4.1

composer.10.json

@@ -35,7 +35,8 @@
             "drupal/core-project-message": true,
             "oomphinc/composer-installers-extender": true,
             "phpstan/extension-installer": true,
-            "php-http/discovery": true
+            "php-http/discovery": true,
+            "simplesamlphp/composer-module-installer": true
         }
     },
     "autoload": {

docker-compose.yml

@@ -63,9 +63,6 @@ services:
     # https://pygmy.readthedocs.io/en/master/ssh_agent/
     volumes_from: ### Local overrides to mount host SSH keys. Automatically removed in CI.
       - container:amazeeio-ssh-agent ### Local overrides to mount host SSH keys. Automatically removed in CI.
-    networks:
-      - amazeeio-network
-      - default
 
   test:
     build:
@@ -82,9 +79,6 @@ services:
       - cli
     environment:
       << : *default-environment
-    networks:
-      - amazeeio-network
-      - default
 
   nginx:
     build:
@@ -122,9 +116,6 @@ services:
       - cli
     environment:
       << : *default-environment
-    networks:
-      - amazeeio-network
-      - default
 
   mariadb:
     image: ${MARIADB_DATA_IMAGE:-govcms/mariadb-drupal:{{ GOVCMS_VERSION }}.x-latest}