summaryrefslogtreecommitdiffstats
path: root/sparkybe-onap-application/src/main/docker/Dockerfile
diff options
context:
space:
mode:
authorJimmy Forsyth <jf2512@att.com>2019-09-04 14:19:59 -0400
committerJimmy Forsyth <jf2512@att.com>2019-09-04 14:20:02 -0400
commit9b556ab194279fed6fbc7b29a6d043fb6ecf19f7 (patch)
treecdd5cde1f2b21990a360f23a122c37c38b5ab25b /sparkybe-onap-application/src/main/docker/Dockerfile
parent21730cb59e91849d6ca2ff5449cfeb4f5fa2d6fd (diff)
Cherry-pick review #92777 for elalto5.1.0-ONAP5.0.2-ONAP5.0.1-ONAPelalto
Issue-ID: INT-1150 Signed-off-by: Jimmy Forsyth <jf2512@att.com> Change-Id: I942a148f9bed098e9e79513765d44ef3e231bf3b
Diffstat (limited to 'sparkybe-onap-application/src/main/docker/Dockerfile')
-rw-r--r--sparkybe-onap-application/src/main/docker/Dockerfile34
1 files changed, 5 insertions, 29 deletions
diff --git a/sparkybe-onap-application/src/main/docker/Dockerfile b/sparkybe-onap-application/src/main/docker/Dockerfile
index 53dc9c3..23cdb7c 100644
--- a/sparkybe-onap-application/src/main/docker/Dockerfile
+++ b/sparkybe-onap-application/src/main/docker/Dockerfile
@@ -1,38 +1,14 @@
-FROM ubuntu:14.04
+FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@
ARG MICRO_HOME=/opt/app/sparky
ARG BIN_HOME=$MICRO_HOME/bin
-RUN apt-get update
-
-# Install and setup java8
-RUN 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
-RUN 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
-ENV JAVA_HOME usr/lib/jvm/java-8-openjdk-amd64
-RUN export JAVA_HOME
-
# Build up the deployment folder structure
RUN mkdir -p $MICRO_HOME
-RUN mkdir -p $BIN_HOME
-RUN mkdir -p $MICRO_HOME/config/
-RUN mkdir -p $MICRO_HOME/lib/
-RUN mkdir -p $MICRO_HOME/static/
-
-ADD *.jar $MICRO_HOME/lib/
-ADD scripts/* $MICRO_HOME/bin/
-COPY static/ $MICRO_HOME/static/
-COPY config/ $MICRO_HOME/config/
-
-COPY oxm $MICRO_HOME/
-
-RUN chmod 755 $MICRO_HOME/bin/*
-RUN chmod 755 $MICRO_HOME/lib/*
-RUN chmod 755 $MICRO_HOME/static/*
-RUN chmod 755 $MICRO_HOME/config/*
-
-RUN ln -s /logs $MICRO_HOME/logs
+WORKDIR $MICRO_HOME
+COPY /maven/sparkybe-onap-application/ .
+RUN chmod 755 $BIN_HOME/* \
+ && ln -snf /logs $MICRO_HOME/logs
EXPOSE 8000 8000
EXPOSE 9517 9517