diff options
| author |   Dmitry Puzikov <dmitry.puzikov@tieto.com> | 2019-07-19 14:52:52 +0200 |
|---|---|---|
| committer | Dmitry Puzikov <dmitry.puzikov@tieto.com> | 2019-08-29 12:17:50 +0200 |
| commit | 0a22bdc8e4979e1a1493c7f604f75bd0b5ab978e (patch) | |
| tree | 0fd761df56d3347b34847499fca500766e268072 /sparkybe-onap-application/src | |
| parent | 9250f693a978f30a6c91dbdff5e49cf12a8277ab (diff) | |
Fixed project version parsing
Change-Id: Iedc6b809dcc4f81c6d5e2424432b9adeadcd3941
Issue-ID: INT-1150
Signed-off-by: Dmitry Puzikov <dmitry.puzikov@tieto.com>
Diffstat (limited to 'sparkybe-onap-application/src')
| -rw-r--r-- | sparkybe-onap-application/src/main/assembly/descriptor.xml | 46 | ||||
| -rw-r--r-- | sparkybe-onap-application/src/main/docker/Dockerfile | 34 | ||||
| -rw-r--r-- | sparkybe-onap-application/src/main/scripts/start.sh | 4 |
3 files changed, 54 insertions, 30 deletions
diff --git a/sparkybe-onap-application/src/main/assembly/descriptor.xml b/sparkybe-onap-application/src/main/assembly/descriptor.xml new file mode 100644 index 0000000..0636952 --- /dev/null +++ b/sparkybe-onap-application/src/main/assembly/descriptor.xml @@ -0,0 +1,46 @@ +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>build</id>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/config</directory>
+ <outputDirectory>/config</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>**/auth/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src/main/scripts</directory>
+ <outputDirectory>/bin</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src/main/static</directory>
+ <outputDirectory>/static</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <outputDirectory>/lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>Dockerfile</exclude>
+ <exclude>*.sh</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
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 diff --git a/sparkybe-onap-application/src/main/scripts/start.sh b/sparkybe-onap-application/src/main/scripts/start.sh index 8369d6c..939f476 100644 --- a/sparkybe-onap-application/src/main/scripts/start.sh +++ b/sparkybe-onap-application/src/main/scripts/start.sh @@ -6,7 +6,9 @@ CONFIG_HOME=${APP_HOME}/config PROPS="-DAPP_HOME=${APP_HOME} -DCONFIG_HOME=${CONFIG_HOME} -Dlogging.config=${CONFIG_HOME}/logging/logback.xml" set -x -jar 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 +jar 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 # # change the working directory so that Spring-Boot will pick up the config folder from the right path |