diff options
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | src/main/docker/Dockerfile | 3 | ||||
| -rw-r--r-- | src/main/docker/scripts/start-zookeeper.sh | 2 | ||||
| -rw-r--r-- | version.properties | 4 |
4 files changed, 6 insertions, 5 deletions
@@ -21,7 +21,7 @@ <groupId>org.onap.dmaap.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>5.0.0-SNAPSHOT</version> + <version>6.0.1-SNAPSHOT</version> <name>zookeeper</name> <licenses> <license> diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index 5a079f1..7e0d715 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -40,6 +40,9 @@ RUN set -x \ # Copy configuration generator script to bin COPY scripts /opt/zookeeper/bin/ +# Copy APIKeys +RUN git clone -b master --single-branch http://gerrit.onap.org/r/dmaap/messagerouter/messageservice.git /tmp/zookeeper/gerrit + # Create a user for the zookeeper process and configure file system ownership # for necessary directories and symlink the distribution as a user executable RUN set -x \ diff --git a/src/main/docker/scripts/start-zookeeper.sh b/src/main/docker/scripts/start-zookeeper.sh index 4585568..ce3a758 100644 --- a/src/main/docker/scripts/start-zookeeper.sh +++ b/src/main/docker/scripts/start-zookeeper.sh @@ -110,9 +110,7 @@ function create_data_dirs() { if [ -d $ZK_DATA_DIR/version-2 ]; then echo "API Keys already loaded"; else - git clone -b master --single-branch http://gerrit.onap.org/r/dmaap/messagerouter/messageservice.git /tmp/zookeeper/gerrit cp -var /tmp/zookeeper/gerrit/oom-topics/data-zookeeper/* $ZK_DATA_DIR; - chown -R $ZK_USER:$ZK_USER /tmp/zookeeper/gerrit rm -rf /tmp/zookeeper/gerrit; echo "Copying API Keys completed."; fi diff --git a/version.properties b/version.properties index fb3ad80..da92029 100644 --- a/version.properties +++ b/version.properties @@ -24,9 +24,9 @@ # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) # because they are used in Jenkins, whose plug-in doesn't support -major=5 +major=6 minor=0 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} |