From 3b9ff00a93cc186c911b495aad30efbb4ac47a8d Mon Sep 17 00:00:00 2001 From: Michiel de Jong Date: Fri, 27 Nov 2020 10:21:03 +0100 Subject: [PATCH 1/7] Use php-solid-crud v0.2 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 84aedd0..468ae2a 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "league/route": "^4.5", "pdsinterop/flysystem-rdf": "dev-master", "pdsinterop/solid-auth": "dev-master", - "pdsinterop/solid-crud": "dev-master", + "pdsinterop/solid-crud": "^0.2", "php-http/httplug": "^2.1", "phptal/phptal": "^1.4" }, From 840fe2e107b65723289841ffab708acff1ccedf3 Mon Sep 17 00:00:00 2001 From: Michiel de Jong Date: Fri, 27 Nov 2020 10:34:32 +0100 Subject: [PATCH 2/7] Use tested branches --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 468ae2a..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": "^0.2", + "pdsinterop/flysystem-rdf": "dev-tested", + "pdsinterop/solid-auth": "dev-tested", + "pdsinterop/solid-crud": "dev-tested", "php-http/httplug": "^2.1", "phptal/phptal": "^1.4" }, From f3bebbabbd0b25a2e4002e1c6d972f4876225afb Mon Sep 17 00:00:00 2001 From: Michiel de Jong Date: Fri, 27 Nov 2020 10:59:20 +0100 Subject: [PATCH 3/7] change composer install command option --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c5e8060..14f68fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ 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 install COPY site.conf /etc/apache2/sites-enabled/site.conf RUN chown -R www-data:www-data /app EXPOSE 443 From f9843ba3c73bbda6ddc3f3c697e4e46f6941e7e6 Mon Sep 17 00:00:00 2001 From: Michiel de Jong Date: Fri, 27 Nov 2020 11:07:50 +0100 Subject: [PATCH 4/7] Use PHP v7.3 --- Dockerfile | 2 +- run-solid-test-suite.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 14f68fd..46df4bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.2-apache +FROM php:7.3-apache RUN apt-get update && \ apt-get install -y \ git \ 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 From 50b9fc4adb032eb1903b9283c26c3f6c369b3238 Mon Sep 17 00:00:00 2001 From: Michiel de Jong Date: Fri, 27 Nov 2020 11:11:57 +0100 Subject: [PATCH 5/7] Try with libzip-dev --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 46df4bf..bde2149 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,7 @@ 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 \ From 988e7cf60028440d481de288960c816ddbc27f89 Mon Sep 17 00:00:00 2001 From: Michiel de Jong Date: Fri, 27 Nov 2020 14:54:00 +0100 Subject: [PATCH 6/7] Use pss-skips branch of webid-provider-tests --- run-solid-test-suite.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run-solid-test-suite.sh b/run-solid-test-suite.sh index 1cde9ab..53bcb83 100755 --- a/run-solid-test-suite.sh +++ b/run-solid-test-suite.sh @@ -11,8 +11,8 @@ function setup { docker build -t cookie https://github.com/pdsinterop/test-suites.git#master:servers/php-solid-server/cookie docker build -t pubsub-server https://github.com/pdsinterop/php-solid-pubsub-server.git#master - docker pull solidtestsuite/webid-provider-tests:v1.1.0 - docker tag solidtestsuite/webid-provider-tests:v1.1.0 webid-provider-tests + docker pull solidtestsuite/webid-provider-tests:pss-skips + docker tag solidtestsuite/webid-provider-tests:pss-skips webid-provider-tests docker pull solidtestsuite/solid-crud-tests:latest docker tag solidtestsuite/solid-crud-tests:latest solid-crud-tests docker pull solidtestsuite/web-access-control-tests:latest From c24dd328766c8ab09a084088743c6a1c2c1d004b Mon Sep 17 00:00:00 2001 From: Michiel de Jong Date: Fri, 27 Nov 2020 15:01:24 +0100 Subject: [PATCH 7/7] Use lcobucci/jwt:3.3.3 --- Dockerfile | 2 ++ run-solid-test-suite.sh | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index bde2149..3d9b20e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,8 @@ RUN php composer-setup.php RUN php -r "unlink('composer-setup.php');" ADD . /app WORKDIR /app +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 diff --git a/run-solid-test-suite.sh b/run-solid-test-suite.sh index 53bcb83..1cde9ab 100755 --- a/run-solid-test-suite.sh +++ b/run-solid-test-suite.sh @@ -11,8 +11,8 @@ function setup { docker build -t cookie https://github.com/pdsinterop/test-suites.git#master:servers/php-solid-server/cookie docker build -t pubsub-server https://github.com/pdsinterop/php-solid-pubsub-server.git#master - docker pull solidtestsuite/webid-provider-tests:pss-skips - docker tag solidtestsuite/webid-provider-tests:pss-skips webid-provider-tests + docker pull solidtestsuite/webid-provider-tests:v1.1.0 + docker tag solidtestsuite/webid-provider-tests:v1.1.0 webid-provider-tests docker pull solidtestsuite/solid-crud-tests:latest docker tag solidtestsuite/solid-crud-tests:latest solid-crud-tests docker pull solidtestsuite/web-access-control-tests:latest