Skip to content

Commit bdf0dd2

Browse files
authored
Merge pull request #5 from pdsinterop/feature/wss
Feature/wss
2 parents 9fe67e2 + e57f524 commit bdf0dd2

File tree

5 files changed

+675
-1717
lines changed

5 files changed

+675
-1717
lines changed

Dockerfile

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
FROM php:7.2
1+
FROM php:8.3
22

33
RUN apt-get update \
44
&& apt-get install -yq --no-install-recommends \
55
git \
66
zip \
77
zlib1g-dev \
8+
openssl \
89
&& rm -rf /var/lib/apt/lists/*
910

1011
COPY . /app
@@ -13,6 +14,13 @@ COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
1314
RUN composer install --working-dir=/app --no-dev --prefer-dist \
1415
&& rm /usr/local/bin/composer
1516

16-
WORKDIR /app
17+
WORKDIR /app/server/certs
18+
RUN openssl genrsa -des3 -passout pass:x -out server.pass.key 2048 && \
19+
openssl rsa -passin pass:x -in server.pass.key -out server.key && \
20+
rm server.pass.key && \
21+
openssl req -new -key server.key -out server.csr -subj "/C=NL/ST=Overijssel/L=Enschede/O=PDSInterop/OU=PDSInterop/CN=solid.pdsinterop.org" && \
22+
openssl x509 -req -days 365 -in server.csr -signkey server.key -out server.crt
23+
24+
WORKDIR /app/server/
1725
EXPOSE 8080
18-
CMD ["php", "server/server.php"]
26+
CMD ["php", "server.php"]

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ docker run \
7171
--rm \
7272
--volume "$PWD:/app" \
7373
-it \
74-
php:7.1 \
74+
php:8.3 \
7575
php --docroot /app/web/ --server "localhost:${PORT}" /app/web/index.php
7676
```
7777
Or on Mac:
@@ -84,7 +84,7 @@ docker run \
8484
--rm \
8585
--volume "$PWD:/app" \
8686
-it \
87-
php:7.1 \
87+
php:8.3 \
8888
php --docroot /app/web/ --server "localhost:${PORT}" /app/web/index.php
8989
```
9090

composer.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"config": {
88
"bin-dir": "./bin",
99
"platform": {
10-
"php": "7.3.11",
10+
"php": "8.3.16",
1111
"ext-dom": "0.0.0",
1212
"ext-mbstring": "0.0.0"
1313
},
@@ -17,9 +17,8 @@
1717
"license": "MIT",
1818
"name": "pdsinterop/solid-pubsub-server",
1919
"require": {
20-
"php": "~7.1",
21-
"cboden/ratchet": "~0.4.3",
22-
"textalk/websocket": "~1.4.1"
20+
"php": "~8.3",
21+
"phrity/websocket": "^3.4"
2322
},
2423
"require-dev": {
2524
"phpunit/phpunit": "*"

0 commit comments

Comments
 (0)