Merge pull request #95 from silinternational/develop

Release 7.4.1

Author: forevermatt

composer.json

@@ -13,7 +13,7 @@
   "require": {
     "php": ">=7.0",
     "simplesamlphp/composer-module-installer": "^1.1.5",
-    "simplesamlphp/simplesamlphp": "~1.17.7 || ~1.18.5",
+    "simplesamlphp/simplesamlphp": "~1.18.6",
     "silinternational/ssp-utilities": "^1.0"
   },
   "require-dev": {

docker-compose.yml

@@ -130,7 +130,7 @@ services:
     command: ["bash", "-c", "whenavail silAuthDb 3306 60 ./run-idp.sh"]
 
   silAuthDb:
-      image: silintl/mariadb:latest
+      image: mariadb:10
       ports:
         - "3306"
       environment:
@@ -170,7 +170,7 @@ services:
     command: ["bash", "-c", "whenavail brokerDb 3306 60 ./yii migrate --interactive=0 && ./run.sh"]
 
   brokerDb:
-      image: silintl/mariadb:latest
+      image: mariadb:10
       ports:
         - "3306"
       environment: