From c7ec1b0fbfda7d81e5800f8dbcab868f11deb501 Mon Sep 17 00:00:00 2001 From: frank chen Date: Tue, 27 Apr 2021 18:50:05 +0800 Subject: [PATCH 1/4] Fix permission problem when creating dirs --- distribution/docker/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/distribution/docker/Dockerfile b/distribution/docker/Dockerfile index f036cc07a437..44f07dc1a638 100644 --- a/distribution/docker/Dockerfile +++ b/distribution/docker/Dockerfile @@ -47,12 +47,13 @@ RUN ["/busybox/busybox", "--install", "/bin"] RUN addgroup -S -g 1000 druid \ && adduser -S -u 1000 -D -H -h /opt/druid -s /bin/sh -g '' -G druid druid \ - && mkdir -p /opt/druid/var \ - && chown -R druid:druid /opt \ - && chmod 775 /opt/druid/var + && mkdir -p /opt COPY --chown=druid:druid --from=builder /opt /opt COPY distribution/docker/druid.sh /druid.sh +RUN mkdir -p /opt/druid/var \ + && chown -R druid:druid /opt \ + && chmod 775 /opt/druid/var USER druid VOLUME /opt/druid/var From ee1baa639345b9214c5c47b31f2ae58d694c2dde Mon Sep 17 00:00:00 2001 From: frank chen Date: Wed, 28 Apr 2021 09:38:31 +0800 Subject: [PATCH 2/4] Fix dir in chown instruction --- distribution/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/docker/Dockerfile b/distribution/docker/Dockerfile index 44f07dc1a638..e714bb9b0fb1 100644 --- a/distribution/docker/Dockerfile +++ b/distribution/docker/Dockerfile @@ -52,7 +52,7 @@ RUN addgroup -S -g 1000 druid \ COPY --chown=druid:druid --from=builder /opt /opt COPY distribution/docker/druid.sh /druid.sh RUN mkdir -p /opt/druid/var \ - && chown -R druid:druid /opt \ + && chown -R druid:druid /opt/druid/var \ && chmod 775 /opt/druid/var USER druid From 642349f7ca435b0ef4c117c9b260723e86eddc4d Mon Sep 17 00:00:00 2001 From: frank chen Date: Thu, 29 Apr 2021 14:42:23 +0800 Subject: [PATCH 3/4] Remove unnecessary instruction and arugment --- distribution/docker/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/distribution/docker/Dockerfile b/distribution/docker/Dockerfile index e714bb9b0fb1..1d0959480af5 100644 --- a/distribution/docker/Dockerfile +++ b/distribution/docker/Dockerfile @@ -46,13 +46,12 @@ COPY --from=busybox /bin/busybox /busybox/busybox RUN ["/busybox/busybox", "--install", "/bin"] RUN addgroup -S -g 1000 druid \ - && adduser -S -u 1000 -D -H -h /opt/druid -s /bin/sh -g '' -G druid druid \ - && mkdir -p /opt + && adduser -S -u 1000 -D -H -h /opt/druid -s /bin/sh -g '' -G druid druid COPY --chown=druid:druid --from=builder /opt /opt COPY distribution/docker/druid.sh /druid.sh -RUN mkdir -p /opt/druid/var \ - && chown -R druid:druid /opt/druid/var \ +RUN mkdir /opt/druid/var \ + && chown druid:druid /opt/druid/var \ && chmod 775 /opt/druid/var USER druid From 1db8e7d53e93b27dd75445597e386d6f8e4780e4 Mon Sep 17 00:00:00 2001 From: frank chen Date: Fri, 30 Apr 2021 10:08:35 +0800 Subject: [PATCH 4/4] Fix Dockerfile for java11 Signed-off-by: frank chen --- distribution/docker/Dockerfile.java11 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/distribution/docker/Dockerfile.java11 b/distribution/docker/Dockerfile.java11 index 8a5eb98af2fb..32eb958fefba 100644 --- a/distribution/docker/Dockerfile.java11 +++ b/distribution/docker/Dockerfile.java11 @@ -46,13 +46,13 @@ COPY --from=busybox /bin/busybox /busybox/busybox RUN ["/busybox/busybox", "--install", "/bin"] RUN addgroup -S -g 1000 druid \ - && adduser -S -u 1000 -D -H -h /opt/druid -s /bin/sh -g '' -G druid druid \ - && mkdir -p /opt/druid/var \ - && chown -R druid:druid /opt \ - && chmod 775 /opt/druid/var + && adduser -S -u 1000 -D -H -h /opt/druid -s /bin/sh -g '' -G druid druid COPY --chown=druid:druid --from=builder /opt /opt COPY distribution/docker/druid.sh /druid.sh +RUN mkdir /opt/druid/var \ + && chown druid:druid /opt/druid/var \ + && chmod 775 /opt/druid/var USER druid VOLUME /opt/druid/var