From: Jimmy Forsyth Date: Thu, 22 Aug 2019 19:28:22 +0000 (-0400) Subject: Revert https://gerrit.onap.org/r/c/aai/gizmo/+/94138 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fgizmo.git;a=commitdiff_plain;h=46a43db79cd709a12c5f6f71acd1379a67061395 Revert https://gerrit.onap.org/r/c/aai/gizmo/+/94138 Issue-ID: AAI-2177 Signed-off-by: Jimmy Forsyth Change-Id: Iaa26f3a1d9c082411bd50e36ec81af94f1e93cc1 --- diff --git a/src/main/bin/start.sh b/src/main/bin/start.sh index 28cca96..d340c07 100644 --- a/src/main/bin/start.sh +++ b/src/main/bin/start.sh @@ -33,8 +33,5 @@ fi JVM_MAX_HEAP=${MAX_HEAP:-1024} set -x -if [ -z "$RUN_MS_AS_ROOT" ] ; then + exec java -Xmx${JVM_MAX_HEAP}m $PROPS -jar ${APP_HOME}/gizmo.jar -else -exec sudo -E java -Xmx${JVM_MAX_HEAP}m $PROPS -jar ${APP_HOME}/gizmo.jar -fi \ No newline at end of file diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index 036091e..b608423 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -12,11 +12,7 @@ ARG USERS_HOME=/opt/aaihome RUN mkdir -p $MICRO_HOME $USERS_HOME /logs \ && groupadd -g 492382 aaiadmin \ && useradd -r -u 341790 -g 492382 -ms /bin/sh -d $USERS_HOME/aaiadmin aaiadmin -##The following 2 lines are added to add the user to the sudoers group -##The script src\main\bin\start.sh could then optionally run the process as sudo user if an environment variable is set -## By default the sudo mode is disabled. -RUN usermod -aG sudo aaiadmin &&\ - echo 'aaiadmin ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers + WORKDIR $MICRO_HOME COPY /maven/gizmo/ . RUN chmod 755 $BIN_HOME/* \