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

WebSocket capable XMR with no ZMQ dependency in the CMS #46

Merged
merged 9 commits into from
Jan 30, 2025
Merged

WebSocket capable XMR with no ZMQ dependency in the CMS #46

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
da3abf1
Troubleshooting: Add some additional logging (#35)
dasgarner Oct 12, 2023
8e66e5e
Web Sockets (#45)
dasgarner Dec 10, 2024
4be42ab
Fix key management routine.
dasgarner Dec 12, 2024
41abe2c
Keys: if the key being added already exists, push the expiry time by …
dasgarner Dec 13, 2024
518e566
Keys: fix type error and actually write expiry time.
dasgarner Dec 13, 2024
a776f7d
XMR: implement 2 relay modes (one for horizontal scaling of new XMR, …
dasgarner Dec 27, 2024
01b2060
XMR: add environment variables for configuring socket addresses and p…
dasgarner Jan 13, 2025
6ed3ecc
XMR: fix relayOldMessages setting.
dasgarner Jan 13, 2025
e48d4c8
XMR: fix relayMessages setting.
dasgarner Jan 13, 2025
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
19 changes: 10 additions & 9 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
FROM composer:1.6 as composer
FROM composer AS composer
COPY . /app
RUN composer install --no-interaction --no-dev --ignore-platform-reqs --optimize-autoloader

FROM php:8.1-cli
MAINTAINER Xibo Signage Ltd <info@xibo.org.uk>
FROM php:8.2-cli
LABEL org.opencontainers.image.authors="Xibo Signage Ltd <info@xibosignage.com>"

ENV XMR_DEBUG false
ENV XMR_QUEUE_POLL 5
ENV XMR_QUEUE_SIZE 10
ENV XMR_IPV6RESPSUPPORT false
ENV XMR_IPV6PUBSUPPORT false
ENV XMR_DEBUG=false
ENV XMR_QUEUE_POLL=5
ENV XMR_QUEUE_SIZE=10
ENV XMR_IPV6PUBSUPPORT=false
ENV XMR_RELAY_OLD_MESSAGES=false
ENV XMR_RELAY_MESSAGES=false

RUN apt-get update && apt-get install -y libzmq3-dev git \
&& rm -rf /var/lib/apt/lists/*
Expand All @@ -24,7 +25,7 @@ RUN git clone https://github.com/zeromq/php-zmq.git \

RUN docker-php-ext-enable zmq

EXPOSE 9505 50001
EXPOSE 8080 8081 9505

COPY ./entrypoint.sh /entrypoint.sh
COPY . /opt/xmr
Expand Down
15 changes: 12 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,22 @@
"bin": ["bin/xmr.phar"],
"config": {
"platform": {
"php": "8.1",
"php": "8.2",
"ext-zmq": "1"
}
},
"require": {
"php": ">=8.1",
"php": ">=8.2",
"monolog/monolog": "^1.17",
"react/zmq": "^0.4.0"
"react/react": "^1.4",
"react/socket": "^1.16",
"react/zmq": "^0.4.0",
"cboden/ratchet": "^0.4.4",
"guzzlehttp/guzzle": "^7.9"
},
"autoload": {
"psr-4": {
"Xibo\\": "src/"
}
}
}
Loading