3.4.10-r4 release

Migrate to non-root container approach.

bitnami/zookeeper/3/Dockerfile

@@ -1,16 +1,19 @@
-FROM bitnami/minideb-extras:jessie-r19
+FROM bitnami/minideb-extras:jessie-r20
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
+ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
+    HOME="/"
+
 # Install required system packages and dependencies
 RUN install_packages libc6 libffi6 libgcc1 libglib2.0-0 liblzma5 libpcre3 libselinux1 libstdc++6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 zlib1g
-RUN bitnami-pkg install java-1.8.131-0 --checksum 5b122a36c8ba44e2f9eb8cbb9b62dd87963742c46f85a04019115d2d43c69e33
-RUN bitnami-pkg unpack zookeeper-3.4.10-2 --checksum cb712b70d1a51ff0889f2d2cbaae83faafd607e6bab00ee9e823f68efa417d94
+RUN bitnami-pkg install java-1.8.141-0 --checksum 5e3e833f2899154285a7feb3d1511f26493f6091774ea90698c71866629991ff
+RUN bitnami-pkg unpack zookeeper-3.4.10-3 --checksum 58f430cc3b0959557dfb186c4388d915af2f1a2900cf1a8c2434544e81a39410
 
 COPY rootfs /
 
 ENV ALLOW_ANONYMOUS_LOGIN="no" \
     BITNAMI_APP_NAME="zookeeper" \
-    BITNAMI_IMAGE_VERSION="3.4.10-r3" \
+    BITNAMI_IMAGE_VERSION="3.4.10-r4" \
     JVMFLAGS="-Xmx1024m -Xms1024m" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/zookeeper/bin:$PATH" \
     ZOO_CLIENT_PASSWORD="" \
@@ -27,5 +30,6 @@ ENV ALLOW_ANONYMOUS_LOGIN="no" \
 
 EXPOSE 2181 2888 3888
 
+USER 1001
 ENTRYPOINT ["/app-entrypoint.sh"]
 CMD ["/run.sh"]

bitnami/zookeeper/3/rootfs/run.sh

@@ -2,14 +2,8 @@
 . /opt/bitnami/base/functions
 . /opt/bitnami/base/helpers
 
-
-DAEMON=zookeeper
-USER=zookeeper
-EXEC=/opt/bitnami/zookeeper/bin/zkServer.sh
-ARGS="start"
-
 export ZOO_LOG_DIR=/opt/bitnami/zookeeper/logs
 export ZOOPIDFILE=/opt/bitnami/zookeeper/tmp/zookeeper.pid
 
-info "Starting ${DAEMON}..."
-exec gosu ${USER} bash -c "${EXEC} ${ARGS} && tail -f ${ZOO_LOG_DIR}/zookeeper.out"
+info "Starting ZooKeeper..."
+/opt/bitnami/zookeeper/bin/zkServer.sh start && tail -f ${ZOO_LOG_DIR}/zookeeper.out

bitnami/zookeeper/README.md

@@ -505,7 +505,13 @@ docker-compose start zookeeper
 ```
 
 # Notable Changes
-## 3.4.10
+
+## 3.4.10-r4
+
+- The zookeeper container has been migrated to a non-root container approach. Previously the container run as `root` user and the zookeeper daemon was started as `zookeeper` user. From now own, both the container and the zookeeper daemon run as user `1001`.
+  As a consequence, the configuration files are writable by the user running the zookeeper process.
+
+## 3.4.10-r0
 
 - New release
 

bitnami/zookeeper/circle.yml

@@ -1,32 +1,54 @@
-machine:
-  services:
-  - docker
-  environment:
-    RELEASE_SERIES_LIST: 3
-    LATEST_STABLE: 3
-    IMAGE_NAME: zookeeper
-    CHART_NAME:
-    CHART_REPO:
-    DOCKER_PROJECT: bitnami
-    QUAY_PROJECT: bitnami
-    GCLOUD_PROJECT: bitnami-containers
+version: 2
+jobs:
+  build:
+    working_directory: /workdir
+    docker:
+      - image: docker:17.06.0-ce-git
+        environment:
+          RELEASE_SERIES_LIST: "3"
+          LATEST_STABLE: "3"
+          IMAGE_NAME: zookeeper
+          DOCKER_PROJECT: bitnami
+          QUAY_PROJECT: bitnami
+          GCLOUD_PROJECT: bitnami-containers
 
-dependencies:
-  override:
-  - docker info
-  - gcloud version
-  - curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-pull-cache.sh | bash -
-
-test:
-  override:
-  - curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-image-test.sh | bash -
+    steps:
+      - checkout
+      - setup_remote_docker:
+          version: 17.06.0-ce
+      - run:
+          name: Install dependencies
+          command: |
+            apk add --no-cache curl bash coreutils
+      - run:
+          name: Docker info
+          command: |
+            docker version
+            docker info
+      - restore_cache:
+          keys:
+            - cache-{{ .Branch }}
+          paths:
+            - /cache/layers.tar
+      - run:
+          name: Build docker image
+          command: |
+            curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-image-test.sh | bash -
+      - save_cache:
+          key: cache-{{ .Branch }}-{{ epoch }}
+          paths:
+            - /cache/layers.tar
+      - deploy:
+          name: Publish docker image
+          command: |
+            if [ -n "${CIRCLE_TAG}" ]; then
+              curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-release-image.sh | bash -
+            elif [ "${CIRCLE_BRANCH}" == "master" ]; then
+              curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-development-image.sh | bash -
+            fi
 
 deployment:
-  development:
-    branch: master
-    commands:
-    - curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-development-image.sh | bash -
   release:
     tag: /^[0-9].*-r[0-9]+$/
     commands:
-    - curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-release-image.sh | bash -
+      - echo "workaround make tags run in 2.0 - https://discuss.circleci.com/t/git-tag-deploys-in-2-0/9493/8"