diff --git a/Dockerfile b/Dockerfile index c5e8060..3d9b20e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,8 @@ -FROM php:7.2-apache +FROM php:7.3-apache RUN apt-get update && \ apt-get install -y \ git \ + libzip-dev \ zlib1g-dev WORKDIR /tls RUN openssl req -new -x509 -days 365 -nodes \ @@ -17,7 +18,9 @@ RUN php composer-setup.php RUN php -r "unlink('composer-setup.php');" ADD . /app WORKDIR /app -RUN php /install/composer.phar install --no-dev --prefer-dist +RUN php /install/composer.phar require lcobucci/jwt:3.3.3 +RUN php /install/composer.phar update +RUN php /install/composer.phar install COPY site.conf /etc/apache2/sites-enabled/site.conf RUN chown -R www-data:www-data /app EXPOSE 443 diff --git a/composer.json b/composer.json index 84aedd0..a26b551 100644 --- a/composer.json +++ b/composer.json @@ -28,9 +28,9 @@ "league/flysystem": "^1.0.", "league/oauth2-server": "^8.0", "league/route": "^4.5", - "pdsinterop/flysystem-rdf": "dev-master", - "pdsinterop/solid-auth": "dev-master", - "pdsinterop/solid-crud": "dev-master", + "pdsinterop/flysystem-rdf": "dev-tested", + "pdsinterop/solid-auth": "dev-tested", + "pdsinterop/solid-crud": "dev-tested", "php-http/httplug": "^2.1", "phptal/phptal": "^1.4" }, diff --git a/run-solid-test-suite.sh b/run-solid-test-suite.sh index 7c4ad21..1cde9ab 100755 --- a/run-solid-test-suite.sh +++ b/run-solid-test-suite.sh @@ -54,4 +54,4 @@ teardown || true setup runPss runTests -teardown +# teardown