Merge pull request #27 from silinternational/develop

Release 2.0.0

Dockerfile

@@ -5,7 +5,7 @@ MAINTAINER Phillip Shipley <[email protected]>
 ENV REFRESHED_AT 2016-12-16
 
 RUN apt-get update -y && \
-    apt-get install -y php-memcache php7.0-gmp && \
+    apt-get install -y php-memcache php-gmp && \
     apt-get clean
 
 # Create required directories
@@ -16,6 +16,7 @@ COPY dockerbuild/setup-logentries.sh /data/setup-logentries.sh
 COPY dockerbuild/run.sh /data/run.sh
 COPY dockerbuild/run-idp.sh /data/run-idp.sh
 COPY dockerbuild/run-tests.sh /data/run-tests.sh
+COPY dockerbuild/run-spidplinks.php /data/run-spidplinks.php
 
 # Copy in syslog config
 RUN rm -f /etc/rsyslog.d/*
@@ -41,6 +42,7 @@ COPY dockerbuild/ssp-overrides/saml20-idp-remote.php $SSP_PATH/metadata/saml20-i
 COPY dockerbuild/ssp-overrides/saml20-sp-remote.php $SSP_PATH/metadata/saml20-sp-remote.php
 COPY dockerbuild/ssp-overrides/config.php $SSP_PATH/config/config.php
 COPY dockerbuild/ssp-overrides/id.php $SSP_PATH/www/id.php
+COPY dockerbuild/ssp-overrides/announcement.php $SSP_PATH/announcement/announcement.php
 COPY tests /data/tests
 
 RUN cp $SSP_PATH/modules/sildisco/sspoverrides/www_saml2_idp/SSOService.php $SSP_PATH/www/saml2/idp/

Makefile

@@ -11,4 +11,4 @@ clean:
 	docker-compose rm -f
 
 composer:
-	docker-compose run --rm composer bash -c "composer self-update && composer update --no-scripts --ignore-platform-reqs"
+	docker-compose run --rm composer bash -c "composer self-update && composer update --no-scripts"

composer.json

@@ -13,10 +13,14 @@
   "require": {
     "php": ">=5.4",
     "roave/security-advisories": "dev-master",
-    "silinternational/simplesamlphp-module-silauth": "^2.3",
-    "silinternational/simplesamlphp-module-sildisco": "dev-develop",
-    "silinternational/ssp-utilities": "dev-develop",
-    "silinternational/ssp-deps": "dev-develop"
+    "simplesamlphp/simplesamlphp": "1.14.15",
+    "simplesamlphp/composer-module-installer": "1.1.6",
+    "silinternational/simplesamlphp-module-expirychecker": "^2.0",
+    "silinternational/simplesamlphp-module-silauth": "^3.0",
+    "silinternational/ssp-utilities": "^1.0",
+    "silinternational/simplesamlphp-module-material": "^3.1",
+    "silinternational/simplesamlphp-module-sildisco": "^1.0",
+    "silinternational/php-env": "^2.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^5.6.1"