eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-20 14:36:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

talk and redis - adjust location of entrypoints

Browse source 
Signed-off-by: Simon L <szaimen@e.mail.de>
This commit is contained in:
Simon L 2023-06-18 01:46:37 +02:00
parent 8151b4a212
commit 776e350e52
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Containers/redis/Dockerfile
View file

@ -1,7 +1,7 @@
# From https://github.com/docker-library/redis/blob/master/7.0/alpine/Dockerfile # From https://github.com/docker-library/redis/blob/master/7.0/alpine/Dockerfile
FROM redis:7.0.11-alpine FROM redis:7.0.11-alpine
COPY --chmod=775 start.sh /usr/bin/start.sh COPY --chmod=775 start.sh /start.sh
RUN set -ex; \ RUN set -ex; \
apk add --no-cache openssl bash; \ apk add --no-cache openssl bash; \
@ -10,7 +10,7 @@ RUN set -ex; \
echo "root:$(openssl rand -base64 12)" | chpasswd echo "root:$(openssl rand -base64 12)" | chpasswd
USER redis USER redis
ENTRYPOINT ["start.sh"] ENTRYPOINT ["/start.sh"]
HEALTHCHECK CMD redis-cli -a $REDIS_HOST_PASSWORD PING || exit 1 HEALTHCHECK CMD redis-cli -a $REDIS_HOST_PASSWORD PING || exit 1
LABEL com.centurylinklabs.watchtower.monitor-only="true" LABEL com.centurylinklabs.watchtower.monitor-only="true"

4
Containers/talk/Dockerfile
View file

@ -6,7 +6,7 @@ USER root
COPY --from=nats /nats-server /usr/local/bin/nats-server COPY --from=nats /nats-server /usr/local/bin/nats-server
COPY --from=signaling /usr/bin/nextcloud-spreed-signaling /usr/local/bin/nextcloud-spreed-signaling COPY --from=signaling /usr/bin/nextcloud-spreed-signaling /usr/local/bin/nextcloud-spreed-signaling
COPY --chmod=775 start.sh /usr/bin/start.sh COPY --chmod=775 start.sh /start.sh
COPY --chmod=664 supervisord.conf /supervisord.conf COPY --chmod=664 supervisord.conf /supervisord.conf
RUN set -ex; \ RUN set -ex; \
@ -64,7 +64,7 @@ RUN set -ex; \
ENV TALK_PORT=3478 ENV TALK_PORT=3478
USER talk USER talk
ENTRYPOINT ["start.sh"] ENTRYPOINT ["/start.sh"]
CMD ["supervisord", "-c", "/supervisord.conf"] CMD ["supervisord", "-c", "/supervisord.conf"]
HEALTHCHECK CMD (nc -z localhost 8081 && nc -z localhost 8188 && nc -z localhost 4222 && nc -z localhost "$TALK_PORT" && nc -z "$NC_DOMAIN" "$TALK_PORT") || exit 1 HEALTHCHECK CMD (nc -z localhost 8081 && nc -z localhost 8188 && nc -z localhost 4222 && nc -z localhost "$TALK_PORT" && nc -z "$NC_DOMAIN" "$TALK_PORT") || exit 1