Skip to content

Commit

Permalink
fix docker image build failure caused by apache#10506
Browse files Browse the repository at this point in the history
  • Loading branch information
xvrl committed Apr 28, 2021
1 parent e720f8b commit 4ded319
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
7 changes: 2 additions & 5 deletions distribution/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,14 @@ LABEL maintainer="Apache Druid Developers <[email protected]>"
COPY --from=busybox /bin/busybox /busybox/busybox
RUN ["/busybox/busybox", "--install", "/bin"]

COPY --from=extractor /opt /opt
COPY ./docker/druid.sh /druid.sh

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

COPY --chown=druid:druid --from=builder /opt /opt
COPY distribution/docker/druid.sh /druid.sh
COPY --chown=druid:druid --from=extractor /opt /opt
COPY ./docker/druid.sh /druid.sh

USER druid
VOLUME /opt/druid/var
Expand Down
7 changes: 2 additions & 5 deletions distribution/docker/Dockerfile.java11
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,14 @@ LABEL maintainer="Apache Druid Developers <[email protected]>"
COPY --from=busybox /bin/busybox /busybox/busybox
RUN ["/busybox/busybox", "--install", "/bin"]

COPY --from=extractor /opt /opt
COPY ./docker/druid.sh /druid.sh

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

COPY --chown=druid:druid --from=builder /opt /opt
COPY distribution/docker/druid.sh /druid.sh
COPY --chown=druid:druid --from=extractor /opt /opt
COPY ./docker/druid.sh /druid.sh

USER druid
VOLUME /opt/druid/var
Expand Down

0 comments on commit 4ded319

Please sign in to comment.