nextcloud/all-in-one
1
1
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2024-09-21 07:16:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2797 from nextcloud/enh/noid/adjust-location-of-entrypoints

Browse source 
talk and redis - adjust location of entrypoints
This commit is contained in:
Simon L 2023-06-19 11:16:04 +02:00 committed by GitHub
parent 799936e0be 776e350e52
commit a8ed5d3dc8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats 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 redis:7.0.11-alpine
COPY --chmod=775 start.sh /usr/bin/start.sh
COPY --chmod=775 start.sh /start.sh
RUN set -ex; \
apk add --no-cache openssl bash; \
@ -10,7 +10,7 @@ RUN set -ex; \
echo "root:$(openssl rand -base64 12)" | chpasswd
USER redis
ENTRYPOINT ["start.sh"]
ENTRYPOINT ["/start.sh"]
HEALTHCHECK CMD redis-cli -a $REDIS_HOST_PASSWORD PING || exit 1
LABEL com.centurylinklabs.watchtower.monitor-only="true"

4
Containers/talk/Dockerfile
View file

@ -8,7 +8,7 @@ ENV ALPINE_VERSION=3.18
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 --chmod=775 start.sh /usr/bin/start.sh
COPY --chmod=775 start.sh /start.sh
COPY --chmod=664 supervisord.conf /supervisord.conf
RUN set -ex; \
@ -67,7 +67,7 @@ RUN set -ex; \
ENV TALK_PORT=3478
USER talk
ENTRYPOINT ["start.sh"]
ENTRYPOINT ["/start.sh"]
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