summaryrefslogtreecommitdiffstats
path: root/deployment
diff options
context:
space:
mode:
authorShashank Kumar Shankar <shashank.kumar.shankar@intel.com>2018-05-23 16:01:03 -0700
committerShashank Kumar Shankar <shashank.kumar.shankar@intel.com>2018-05-23 16:03:24 -0700
commit18d9d994e85ef897d570081bc3a7e1da42b49c1e (patch)
treec1e05000de167c04f14fd81cc25fb8583078463d /deployment
parent5e6124aa915bd66734214ded0a25740b544bfa52 (diff)
Create Token Service JSON dynamically2.0.0-ONAPbeijing2.0.0-ONAP
This patch makes sure the Token Service JSON is dynically created so that this fits better when deployed on Kubernetes. Change-Id: I4426f68af2a6de4d2ffe4f488d5660c47f13ccaf Issue-ID: MUSIC-55 Signed-off-by: Shashank Kumar Shankar <shashank.kumar.shankar@intel.com>
Diffstat (limited to 'deployment')
-rw-r--r--deployment/Dockerfile10
-rwxr-xr-xdeployment/docker-build.sh2
2 files changed, 6 insertions, 6 deletions
diff --git a/deployment/Dockerfile b/deployment/Dockerfile
index 1c1e3f6..f9c45ce 100644
--- a/deployment/Dockerfile
+++ b/deployment/Dockerfile
@@ -9,11 +9,11 @@ ENV DATASTORE_IP $DATASTORE_IP
ENV CONSUL_VERSION 1.0.6
RUN apk update && \
- apk add g++ && \
- apk add make && \
+ # apk add g++ && \
+ # apk add make && \
apk add unzip && \
- apk add git && \
- apk add curl && \
+ # apk add git && \
+ # apk add curl && \
apk add wget && \
apk add --no-cache bash
@@ -34,7 +34,7 @@ RUN mkdir /dkv_mount_path && \
WORKDIR /dkv_mount_path
ADD ./dkv /dkv_mount_path/
-ADD ./token_service_map.json /dkv_mount_path/api/
+# ADD ./token_service_map.json /dkv_mount_path/api/
ADD ./docker-entrypoint.sh /dkv_mount_path/
ENTRYPOINT /dkv_mount_path/docker-entrypoint.sh \ No newline at end of file
diff --git a/deployment/docker-build.sh b/deployment/docker-build.sh
index 3b7e3b3..4568e53 100755
--- a/deployment/docker-build.sh
+++ b/deployment/docker-build.sh
@@ -23,7 +23,7 @@ function generate_binary {
cp ../target/dkv .
# Change the following work around for reading token_service.json
- cp ../src/dkv/api/token_service_map.json .
+ # cp ../src/dkv/api/token_service_map.json .
}
function build_image {