From 132444cbb967aacdb1109d458241605fbc9c394e Mon Sep 17 00:00:00 2001 From: Zoey Date: Wed, 3 May 2023 16:37:22 +0200 Subject: [PATCH 1/3] optimize talk Dockerfile Signed-off-by: Zoey --- Containers/talk/Dockerfile | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Containers/talk/Dockerfile b/Containers/talk/Dockerfile index 476025c2..14192bb1 100644 --- a/Containers/talk/Dockerfile +++ b/Containers/talk/Dockerfile @@ -6,6 +6,9 @@ USER root 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=664 supervisord.conf /supervisord.conf + RUN set -ex; \ apk add --no-cache \ ca-certificates \ @@ -30,15 +33,11 @@ RUN set -ex; \ util-linux \ build-base \ lua5.3-dev \ - luarocks5.3; - + luarocks5.3; \ + \ # Give root a random password -RUN echo "root:$(openssl rand -base64 12)" | chpasswd - -COPY --chmod=775 start.sh /usr/bin/start.sh -COPY --chmod=664 supervisord.conf /supervisord.conf - -RUN set -ex; \ + echo "root:$(openssl rand -base64 12)" | chpasswd; \ + \ touch \ /etc/nats.conf \ /etc/signaling.conf \ From fb45fa40739be0ce3fce9f4fd834eae9e75907d1 Mon Sep 17 00:00:00 2001 From: Zoey Date: Wed, 3 May 2023 17:11:18 +0200 Subject: [PATCH 2/3] add suggestion Co-authored-by: Simon L. Signed-off-by: Zoey --- Containers/talk/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containers/talk/Dockerfile b/Containers/talk/Dockerfile index 14192bb1..b100ce14 100644 --- a/Containers/talk/Dockerfile +++ b/Containers/talk/Dockerfile @@ -35,7 +35,7 @@ RUN set -ex; \ lua5.3-dev \ luarocks5.3; \ \ -# Give root a random password + # Give root a random password echo "root:$(openssl rand -base64 12)" | chpasswd; \ \ touch \ From 7c11a8a278362bc781499a8ec77c831aae79dec5 Mon Sep 17 00:00:00 2001 From: Simon L Date: Wed, 3 May 2023 17:32:56 +0200 Subject: [PATCH 3/3] Update Containers/talk/Dockerfile Signed-off-by: Simon L. --- Containers/talk/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containers/talk/Dockerfile b/Containers/talk/Dockerfile index b100ce14..14192bb1 100644 --- a/Containers/talk/Dockerfile +++ b/Containers/talk/Dockerfile @@ -35,7 +35,7 @@ RUN set -ex; \ lua5.3-dev \ luarocks5.3; \ \ - # Give root a random password +# Give root a random password echo "root:$(openssl rand -base64 12)" | chpasswd; \ \ touch \