summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsunil.unnava <sunil.unnava@att.com>2019-05-02 09:47:39 -0400
committersunil.unnava <sunil.unnava@att.com>2019-05-02 09:47:52 -0400
commitb8bd13eb761b8f3a5a346b2444fbd2e5de9376a9 (patch)
tree353311c6396d5eab5942f40e73dcb25324a7c04f
parenta04ce6f0ff17906216a551f2418c59cb3294d3bb (diff)
move API Keys copy to docker image
Issue-ID: DMAAP-1144 Change-Id: I06e6f33927381f128d64cda354d5fd6d6b1adc70 Signed-off-by: sunil.unnava <sunil.unnava@att.com>
-rw-r--r--src/main/docker/Dockerfile3
-rw-r--r--src/main/docker/scripts/start-zookeeper.sh2
2 files changed, 3 insertions, 2 deletions
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