diff options
| author |   Jimmy Forsyth <jf2512@att.com> | 2019-08-22 15:28:22 -0400 |
|---|---|---|
| committer | Jimmy Forsyth <jf2512@att.com> | 2019-08-22 15:28:25 -0400 |
| commit | 46a43db79cd709a12c5f6f71acd1379a67061395 (patch) | |
| tree | d68d5f341476aecd1840336865b3c8673743d797 | |
| parent | 34c72a4d56324182b2e1d6f6fbaa508ca0953d2f (diff) | |
Revert https://gerrit.onap.org/r/c/aai/gizmo/+/94138
Issue-ID: AAI-2177
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Change-Id: Iaa26f3a1d9c082411bd50e36ec81af94f1e93cc1
| -rw-r--r-- | src/main/bin/start.sh | 5 | ||||
| -rw-r--r-- | src/main/docker/Dockerfile | 6 |
2 files changed, 2 insertions, 9 deletions
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/* \ |