Merge pull request #3523 from nextcloud/smaller-talk

This commit is contained in:
Simon L 2023-10-16 10:43:33 +02:00 committed by GitHub
commit eee6157f54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -35,10 +35,10 @@ RUN set -ex; \
FROM alpine:3.18.4 FROM alpine:3.18.4
ENV ETURNAL_ETC_DIR="/conf" ENV ETURNAL_ETC_DIR="/conf"
COPY --from=janus /usr/local /usr/local COPY --from=janus --chmod=777 --chown=1000:1000 /usr/local /usr/local
COPY --from=eturnal /opt/eturnal /opt/eturnal COPY --from=eturnal --chmod=777 --chown=1000:1000 /opt/eturnal /opt/eturnal
COPY --from=nats /nats-server /usr/local/bin/nats-server COPY --from=nats --chmod=777 --chown=1000:1000 /nats-server /usr/local/bin/nats-server
COPY --from=signaling /usr/bin/nextcloud-spreed-signaling /usr/local/bin/nextcloud-spreed-signaling COPY --from=signaling --chmod=777 --chown=1000:1000 /usr/bin/nextcloud-spreed-signaling /usr/local/bin/nextcloud-spreed-signaling
COPY --chmod=775 start.sh /start.sh COPY --chmod=775 start.sh /start.sh
COPY --chmod=775 healthcheck.sh /healthcheck.sh COPY --chmod=775 healthcheck.sh /healthcheck.sh
@ -66,7 +66,7 @@ RUN set -ex; \
libwebsockets \ libwebsockets \
\ \
shadow; \ shadow; \
useradd --system eturnal; \ useradd --system -u 1000 eturnal; \
apk del --no-cache \ apk del --no-cache \
shadow; \ shadow; \
\ \
@ -85,15 +85,12 @@ RUN set -ex; \
/var/run/supervisord \ /var/run/supervisord \
/usr/local/lib/janus/loggers; \ /usr/local/lib/janus/loggers; \
chown eturnal:eturnal -R \ chown eturnal:eturnal -R \
/usr \
/opt/eturnal \
/etc/nats.conf \ /etc/nats.conf \
/var/log/supervisord \ /var/log/supervisord \
/var/run/supervisord; \ /var/run/supervisord; \
chmod 777 -R \ chmod 777 -R \
/tmp \ /tmp \
/conf \ /conf \
/opt/eturnal \
/var/run/supervisord \ /var/run/supervisord \
/var/log/supervisord; \ /var/log/supervisord; \
ln -s /opt/eturnal/bin/stun /usr/local/bin/stun; \ ln -s /opt/eturnal/bin/stun /usr/local/bin/stun; \