Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for multi-arch (amd64, arm/v7, arm64/v8, ppc64le, s390x) #90

Closed
wants to merge 2 commits into from
Closed

Support for multi-arch (amd64, arm/v7, arm64/v8, ppc64le, s390x) #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d646d7c
Support for multi-arch
jonstelly Feb 6, 2020
c38c301
pin to specific version of adoptopenjdk (8u232-b09-jre-hotspot)
jonstelly Feb 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions 3.4.14/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:8-jre-slim
FROM adoptopenjdk:8u232-b09-jre-hotspot

ENV ZOO_CONF_DIR=/conf \
ZOO_DATA_DIR=/data \
Expand All @@ -25,13 +25,10 @@ RUN set -eux; \
apt-get install -y --no-install-recommends \
ca-certificates \
dirmngr \
gosu \
gnupg \
netcat \
wget; \
rm -rf /var/lib/apt/lists/*; \
# Verify that gosu binary works
gosu nobody true

ARG GPG_KEY=3F7A1D16FA4217B1DC75E1C9FFE35B7F15DFA1BA
ARG DISTRO_NAME=zookeeper-3.4.14
Expand Down
2 changes: 1 addition & 1 deletion 3.4.14/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e
# Allow the container to be started with `--user`
if [[ "$1" = 'zkServer.sh' && "$(id -u)" = '0' ]]; then
chown -R zookeeper "$ZOO_DATA_DIR" "$ZOO_DATA_LOG_DIR" "$ZOO_LOG_DIR" "$ZOO_CONF_DIR"
exec gosu zookeeper "$0" "$@"
exec su zookeeper "$0" "$@"
fi

# Generate the config only if it doesn't exist
Expand Down
7 changes: 2 additions & 5 deletions 3.5.6/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:8-jre-slim
FROM adoptopenjdk:8u232-b09-jre-hotspot

ENV ZOO_CONF_DIR=/conf \
ZOO_DATA_DIR=/data \
Expand Down Expand Up @@ -27,13 +27,10 @@ RUN set -eux; \
apt-get install -y --no-install-recommends \
ca-certificates \
dirmngr \
gosu \
gnupg \
netcat \
wget; \
rm -rf /var/lib/apt/lists/*; \
# Verify that gosu binary works
gosu nobody true
rm -rf /var/lib/apt/lists/*;

ARG GPG_KEY=BBE7232D7991050B54C8EA0ADC08637CA615D22C
ARG SHORT_DISTRO_NAME=zookeeper-3.5.6
Expand Down
2 changes: 1 addition & 1 deletion 3.5.6/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e
# Allow the container to be started with `--user`
if [[ "$1" = 'zkServer.sh' && "$(id -u)" = '0' ]]; then
chown -R zookeeper "$ZOO_DATA_DIR" "$ZOO_DATA_LOG_DIR" "$ZOO_LOG_DIR" "$ZOO_CONF_DIR"
exec gosu zookeeper "$0" "$@"
exec su zookeeper "$0" "$@"
fi

# Generate the config only if it doesn't exist
Expand Down