diff options
Diffstat (limited to 'ms/sdclistener/distribution')
| -rwxr-xr-x | ms/sdclistener/distribution/pom.xml | 28 | ||||
| -rwxr-xr-x | ms/sdclistener/distribution/src/main/docker/Dockerfile | 19 | ||||
| -rwxr-xr-x[-rw-r--r--] | ms/sdclistener/distribution/src/main/docker/startService.sh | 0 |
3 files changed, 18 insertions, 29 deletions
diff --git a/ms/sdclistener/distribution/pom.xml b/ms/sdclistener/distribution/pom.xml index ec02cfb5c..e9f5b949e 100755 --- a/ms/sdclistener/distribution/pom.xml +++ b/ms/sdclistener/distribution/pom.xml @@ -20,15 +20,15 @@ <parent> <groupId>org.onap.ccsdk.cds.sdclistener</groupId> - <artifactId>parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <artifactId>sdclistener-parent</artifactId> + <version>1.1.0-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> - <artifactId>distribution</artifactId> + <artifactId>sdclistener-distribution</artifactId> <packaging>pom</packaging> - <name>SDC Listener Distribution</name> + <name>MS SDC Listener - Distribution</name> <properties> <assembly.id>maven</assembly.id> @@ -37,16 +37,12 @@ <image.name>onap/ccsdk-sdclistener</image.name> <!--disabled for now to mirror #85964 https://gerrit.onap.org/r/#/c/85964/2/ms/command-executor/pom.xml--> <!--<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>--> - <docker.push.phase>deploy</docker.push.phase> - <docker.verbose>true</docker.verbose> - <ccsdk.project.version>${project.version}</ccsdk.project.version> - <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> </properties> <dependencies> <dependency> <groupId>org.onap.ccsdk.cds.sdclistener</groupId> - <artifactId>application</artifactId> + <artifactId>sdclistener-application</artifactId> </dependency> </dependencies> @@ -144,7 +140,7 @@ <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> - <version>0.26.1</version> + <version>0.34.0</version> <inherited>false</inherited> <configuration> <images> @@ -161,18 +157,12 @@ </build> </image> </images> - <verbose>true</verbose> + <verbose>${docker.verbose}</verbose> + <skipPush>${docker.skip.push}</skipPush> </configuration> <executions> <execution> - <id>generate-images</id> - <phase>package</phase> - <goals> - <goal>build</goal> - </goals> - </execution> - <execution> - <id>push-images</id> + <id>build-push-images</id> <phase>${docker.push.phase}</phase> <goals> <goal>build</goal> diff --git a/ms/sdclistener/distribution/src/main/docker/Dockerfile b/ms/sdclistener/distribution/src/main/docker/Dockerfile index 41622fae1..b89cbc7ec 100755 --- a/ms/sdclistener/distribution/src/main/docker/Dockerfile +++ b/ms/sdclistener/distribution/src/main/docker/Dockerfile @@ -1,19 +1,18 @@ -FROM openjdk:8-jdk-alpine +FROM onap/ccsdk-alpine-j11-image:1.0.1 -RUN addgroup -S -g 1000 onap && adduser -S onap -u 1000 -G onap +USER root # add entrypoint -COPY startService.sh /startService.sh -RUN chown onap:onap /startService.sh -RUN chmod 751 /startService.sh +COPY startService.sh /opt/app/onap/sdc-listener/startService.sh # add application COPY @project.build.finalName@-@assembly.id@.tar.gz /source.tar.gz + RUN tar -xzf /source.tar.gz -C /tmp \ && cp -rf /tmp/@project.build.finalName@/opt / \ && rm -rf /source.tar.gz \ - && rm -rf /tmp/@project.build.finalName@ - -RUN mkdir -p /opt/app/onap/cds-sdc-listener -RUN chown onap:onap /opt -R + && rm -rf /tmp/@project.build.finalName@ \ + && mkdir -p /opt/app/onap/cds-sdc-listener \ + && chown onap:onap /opt -R \ + && chmod 755 /opt/app/onap/sdc-listener/startService.sh USER onap -ENTRYPOINT /startService.sh +ENTRYPOINT /opt/app/onap/sdc-listener/startService.sh diff --git a/ms/sdclistener/distribution/src/main/docker/startService.sh b/ms/sdclistener/distribution/src/main/docker/startService.sh index 7ad6171b8..7ad6171b8 100644..100755 --- a/ms/sdclistener/distribution/src/main/docker/startService.sh +++ b/ms/sdclistener/distribution/src/main/docker/startService.sh |