From: khemendra kumar <khemendra.kumar@huawei.com>
Date: Thu, 11 Feb 2021 07:41:52 +0000 (+0530)
Subject: updaed docker file for ssh pass support
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=7eb939891f405d26f83c8f3a8d373f6ef8072245;p=ealt-edge.git

updaed docker file for ssh pass support

Signed-off-by: khemendra kumar <khemendra.kumar@huawei.com>
Change-Id: Ib7393625f4ab8d2813e7cd354f6fdde9a6c9bc9d
---

diff --git a/example-apps/ROBO/backup_BE/backup-k8s.yaml b/example-apps/ROBO/backup_BE/backup-k8s.yaml
index 195e346..782ac75 100644
--- a/example-apps/ROBO/backup_BE/backup-k8s.yaml
+++ b/example-apps/ROBO/backup_BE/backup-k8s.yaml
@@ -36,6 +36,9 @@ spec:
           env:
             - name: KUBE_CONFIG
               value: "/usr/app/.kube/config"
+            - name: HOSTIP
+              value: "10.10.0.54"
+
           ports:
             - containerPort: 8091
           volumeMounts:
@@ -57,7 +60,7 @@ spec:
   accessModes:
     - ReadWriteOnce
   hostPath:
-    path: "/home/root1/.kube/"
+    path: "/root/.kube/"
 
 # pvc
 ---
diff --git a/example-apps/ROBO/backup_BE/docker/Dockerfile b/example-apps/ROBO/backup_BE/docker/Dockerfile
index 80fd89d..75d01ba 100644
--- a/example-apps/ROBO/backup_BE/docker/Dockerfile
+++ b/example-apps/ROBO/backup_BE/docker/Dockerfile
@@ -14,33 +14,21 @@
 
 # FROM swr.ap-southeast-1.myhuaweicloud.com/edgegallery/openjdk:8u201-jdk-alpine
 
+# currently this pod is running as root user due to this need to communicate with host shell.config
+# in future this can be further checked with adding some level restrictions to user
 FROM openjdk:11-jre-slim
-# Define all environment variable here
-#ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
+
 ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64/bin/java
 
-ENV TZ='Asia/Shanghai'
 ENV APP_FILE backup.jar
 ENV APP_HOME /usr/app
-ENV UID=166
-ENV GID=166
-ENV USER_NAME=eguser
-ENV GROUP_NAME=eggroup
-ENV ENV="/etc/profile"
-
-# # CREATE APP USER ##
-# Set umask
-RUN sed -i "s|umask 022|umask 027|g" /etc/profile
 
 # Create the home directory for the new app user.
 RUN mkdir -p /usr/app
 RUN mkdir -p /usr/app/bin
 
 # Create an app user so our program doesn't run as root.
-RUN apt-get update &&\
-#    apt-get add shadow &&\
-    groupadd -r -g $GID $GROUP_NAME &&\
-    useradd -r -u $UID -g $GID -d $APP_HOME -s /sbin/nologin -c "Docker image user" $USER_NAME
+RUN apt-get update && apt-get install -y sshpass
 
 WORKDIR $APP_HOME
 
@@ -50,16 +38,13 @@ RUN chmod 750 $APP_HOME &&\
     mkdir -p -m 750 $APP_HOME/log &&\
     mkdir -p -m 750 $APP_HOME/packages &&\
     mkdir -p -m 700 $APP_HOME/ssl &&\
-    mkdir -p -m 700 $APP_HOME/.kube &&\
-    chown -R $USER_NAME:$GROUP_NAME $APP_HOME
+    mkdir -p -m 700 $APP_HOME/.kube
 
-COPY --chown=$USER_NAME:$GROUP_NAME /target/*.jar $APP_HOME/bin
-COPY --chown=$USER_NAME:$GROUP_NAME config $APP_HOME/.kube
+COPY /target/*.jar $APP_HOME/bin
 
 EXPOSE 8091
 
 # Change to the app user.
-USER $USER_NAME
 
 # Execute script & application
 ENTRYPOINT ["sh", "-c"]