Fix Docker image and helm issue

Issue-ID: INF-317

Signed-off-by: Bin Yang <bin.yang@windriver.com>
Change-Id: I8efb52d9d804d104e8c6f1ca8f51c0ce420b126c

diff --git a/Dockerfile b/Dockerfile
index c3aba8d..989e9d4 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,6 +36,12 @@ COPY o2ims/ /src/o2ims/
 COPY o2dms/ /src/o2dms/
 COPY o2common/ /src/o2common/
 
+RUN mkdir -p /src/helm_sdk/
+COPY helm_sdk/ /src/helm_sdk/
+
+RUN mkdir -p /configs/
+COPY configs/ /configs/
+
 RUN mkdir -p /src/o2app/
 COPY o2app/ /src/o2app/
 COPY setup.py /src/

diff --git a/charts/templates/deployment.yaml b/charts/templates/deployment.yaml
index d9ebf10..5f64ccb 100644 (file)
--- a/charts/templates/deployment.yaml
+++ b/charts/templates/deployment.yaml
@@ -139,8 +139,8 @@ spec:
           volumeMounts:
             - name: scripts
               mountPath: /opt
-            - name: configs
-              mountPath: /configs
+            # - name: configs
+            #   mountPath: /configs
             - name: applicationconfig
               mountPath: /configs/o2app.conf
               subPath: config.json
@@ -170,8 +170,8 @@ spec:
         - name: scripts
           configMap:
             name: {{ .Chart.Name }}-scripts-configmap
-        - name: configs
-          emptyDir: {}
+        # - name: configs
+        #   emptyDir: {}
         - configMap:
             name: {{ .Chart.Name }}-application-config
           name: applicationconfig