diff options
Diffstat (limited to 'sparkybe-onap-application/src/main')
| -rw-r--r-- | sparkybe-onap-application/src/main/docker/Dockerfile | 29 | ||||
| -rw-r--r-- | sparkybe-onap-application/src/main/scripts/start.sh | 31 |
2 files changed, 58 insertions, 2 deletions
diff --git a/sparkybe-onap-application/src/main/docker/Dockerfile b/sparkybe-onap-application/src/main/docker/Dockerfile index 23cdb7c..117c54c 100644 --- a/sparkybe-onap-application/src/main/docker/Dockerfile +++ b/sparkybe-onap-application/src/main/docker/Dockerfile @@ -5,6 +5,35 @@ ARG BIN_HOME=$MICRO_HOME/bin # Build up the deployment folder structure RUN mkdir -p $MICRO_HOME + +# Changes related to:AAI-2180 +# Additional optional steps for Ubuntu +RUN if ((uname -v | grep -i "ubuntu") || ( cat /etc/*release|grep -i "ubuntu") ) ; then \ + ##################################### + #if JAVA doesnt exist then install it: + ###################################### + if type java 2>/dev/null; then \ + echo "skipping java installation"; \ + else \ + apt-get update && apt-get install -y software-properties-common; \ + ## sudo -E is required to preserve the environment. If you remove that line, it will most like freeze at this step + sudo -E add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk ; \ + ## Setup JAVA_HOME, this is useful for docker commandline + JAVA_HOME=usr/lib/jvm/java-8-openjdk-amd64; \ + export JAVA_HOME ; \ + fi; \ + ########################################## + #Install gosu if not present + ########################################## + if type gosu 2>/dev/null; then \ + echo "skipping gosu installation"; \ + else \ + set -x ; \ + add-apt-repository -y ppa:tianon/gosu; \ + sudo apt-get update; \ + sudo apt-get install gosu; \ + fi;\ +fi WORKDIR $MICRO_HOME COPY /maven/sparkybe-onap-application/ . RUN chmod 755 $BIN_HOME/* \ diff --git a/sparkybe-onap-application/src/main/scripts/start.sh b/sparkybe-onap-application/src/main/scripts/start.sh index 939f476..512d552 100644 --- a/sparkybe-onap-application/src/main/scripts/start.sh +++ b/sparkybe-onap-application/src/main/scripts/start.sh @@ -5,8 +5,35 @@ CONFIG_HOME=${APP_HOME}/config PROPS="-DAPP_HOME=${APP_HOME} -DCONFIG_HOME=${CONFIG_HOME} -Dlogging.config=${CONFIG_HOME}/logging/logback.xml" +# Changes related to:AAI-2180 +# Change aai sparky container processes to run as non-root on the host +USER_ID=${LOCAL_USER_ID:-9001} +GROUP_ID=${LOCAL_GROUP_ID:-9001} +UI_LOGS=/var/log/onap/AAI-UI + +if [ $(cat /etc/passwd | grep aaiadmin | wc -l) -eq 0 ]; then + + groupadd aaiadmin -g ${GROUP_ID} || { + echo "Unable to create the group id for ${GROUP_ID}"; + exit 1; + } + useradd --shell=/bin/bash -u ${USER_ID} -g ${GROUP_ID} -o -c "" -m aaiadmin || { + echo "Unable to create the user id for ${USER_ID}"; + exit 1; + } +fi; +chown -R aaiadmin:aaiadmin ${MICRO_HOME} +chown -R aaiadmin:aaiadmin ${APP_HOME} +chown -R aaiadmin:aaiadmin ${UI_LOGS} +find ${MICRO_HOME} -name "*.sh" -exec chmod +x {} + + +gosu aaiadmin ln -s /logs $MICRO_HOME/logs +JAVA_CMD="exec gosu aaiadmin java"; +JAR_CMD="exec gosu aaiadmin jar"; + +### set -x -jar ufv ${APP_HOME}/lib/sparkybe-onap-application*.jar \ +{JAR_CMD} ufv ${APP_HOME}/lib/sparkybe-onap-application*.jar \ -C ${CONFIG_HOME}/portal/ BOOT-INF/classes/portal.properties \ -C ${CONFIG_HOME}/portal/ BOOT-INF/classes/key.properties > /dev/null 2>&1 @@ -15,4 +42,4 @@ jar ufv ${APP_HOME}/lib/sparkybe-onap-application*.jar \ # cd $APP_HOME -java -Xms1024m -Xmx4096m $PROPS -jar ${APP_HOME}/lib/sparkybe-onap-application*.jar
\ No newline at end of file +${JAVA_CMD} -Xms1024m -Xmx4096m $PROPS -jar ${APP_HOME}/lib/sparkybe-onap-application*.jar |