Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix solid tests #35

Merged
merged 7 commits into from
Nov 27, 2020
Merged

Fix solid tests #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3b9ff00
Use php-solid-crud v0.2
michielbdejong Nov 27, 2020
840fe2e
Use tested branches
michielbdejong Nov 27, 2020
f3bebba
change composer install command option
michielbdejong Nov 27, 2020
f9843ba
Use PHP v7.3
michielbdejong Nov 27, 2020
50b9fc4
Try with libzip-dev
michielbdejong Nov 27, 2020
988e7cf
Use pss-skips branch of webid-provider-tests
michielbdejong Nov 27, 2020
c24dd32
Use lcobucci/jwt:3.3.3
michielbdejong Nov 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion run-solid-test-suite.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ teardown || true
setup
runPss
runTests
teardown
# teardown