diff options
| -rw-r--r-- | cds-ui/application/pom.xml | 19 | ||||
| -rw-r--r-- | cds-ui/client/pom.xml | 6 | ||||
| -rw-r--r-- | cds-ui/designer-client/pom.xml | 6 | ||||
| -rw-r--r-- | cds-ui/pom.xml | 5 | ||||
| -rw-r--r-- | cds-ui/server/pom.xml | 18 | ||||
| -rwxr-xr-x | ms/blueprintsprocessor/application/pom.xml | 17 | ||||
| -rwxr-xr-x | ms/blueprintsprocessor/application/src/main/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | ms/blueprintsprocessor/application/src/test/resources/logback-test.xml | 6 | ||||
| -rwxr-xr-x | ms/blueprintsprocessor/pom.xml | 5 | ||||
| -rwxr-xr-x | ms/command-executor/pom.xml | 18 | ||||
| -rw-r--r-- | ms/command-executor/src/main/docker/Dockerfile | 14 | ||||
| -rw-r--r-- | ms/pom.xml | 2 | ||||
| -rw-r--r-- | ms/py-executor/docker/Dockerfile | 10 | ||||
| -rw-r--r-- | ms/py-executor/pom.xml | 18 | ||||
| -rwxr-xr-x | ms/sdclistener/distribution/pom.xml | 17 | ||||
| -rwxr-xr-x | ms/sdclistener/parent/pom.xml | 1 | ||||
| -rw-r--r-- | ms/sdclistener/pom.xml | 6 | ||||
| -rw-r--r-- | pom.xml | 7 |
18 files changed, 56 insertions, 121 deletions
diff --git a/cds-ui/application/pom.xml b/cds-ui/application/pom.xml index 368cc9c4f..22d5cabc8 100644 --- a/cds-ui/application/pom.xml +++ b/cds-ui/application/pom.xml @@ -37,9 +37,6 @@ limitations under the License. <properties> <image.name>onap/ccsdk-cds-ui</image.name> - <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> - <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> - <docker.verbose>true</docker.verbose> </properties> <build> @@ -71,7 +68,7 @@ limitations under the License. <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> - <version>0.28.0</version> + <version>0.34.0</version> <inherited>false</inherited> <configuration> <images> @@ -87,19 +84,13 @@ limitations under the License. </build> </image> </images> + <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> - <phase>deploy</phase> + <id>build-push-images</id> + <phase>${docker.push.phase}</phase> <goals> <goal>build</goal> <goal>push</goal> diff --git a/cds-ui/client/pom.xml b/cds-ui/client/pom.xml index c4b7ea908..ec0326a7e 100644 --- a/cds-ui/client/pom.xml +++ b/cds-ui/client/pom.xml @@ -35,12 +35,6 @@ limitations under the License. <name>UI Client</name> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <npm.executable>npm</npm.executable> - <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> - </properties> - <build> <plugins> <plugin> diff --git a/cds-ui/designer-client/pom.xml b/cds-ui/designer-client/pom.xml index 9a1ba2627..34f56e1f7 100644 --- a/cds-ui/designer-client/pom.xml +++ b/cds-ui/designer-client/pom.xml @@ -35,12 +35,6 @@ limitations under the License. <name>UI designer Client</name> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <npm.executable>npm</npm.executable> - <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> - </properties> - <build> <plugins> <plugin> diff --git a/cds-ui/pom.xml b/cds-ui/pom.xml index 1aa68131c..6d547326c 100644 --- a/cds-ui/pom.xml +++ b/cds-ui/pom.xml @@ -45,10 +45,15 @@ limitations under the License. </modules> <properties> + <npm.executable>npm</npm.executable> <image.name>onap/ccsdk-cds-ui</image.name> <ccsdk.cds.version>${project.version}</ccsdk.cds.version> <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> + + <!-- docker related properties --> <docker.verbose>true</docker.verbose> + <docker.skip.push>false</docker.skip.push> + <docker.push.phase>deploy</docker.push.phase> </properties> </project> diff --git a/cds-ui/server/pom.xml b/cds-ui/server/pom.xml index 86e9ccbef..6444385ee 100644 --- a/cds-ui/server/pom.xml +++ b/cds-ui/server/pom.xml @@ -36,11 +36,7 @@ limitations under the License. <name>UI Server</name> <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <npm.executable>npm</npm.executable> - <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <image.name>onap/ccsdk-cds-ui-server</image.name> - <docker.push.phase>deploy</docker.push.phase> </properties> <build> @@ -148,7 +144,7 @@ limitations under the License. <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> @@ -165,18 +161,12 @@ limitations under the License. </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/blueprintsprocessor/application/pom.xml b/ms/blueprintsprocessor/application/pom.xml index fdfd7d157..08390bd47 100755 --- a/ms/blueprintsprocessor/application/pom.xml +++ b/ms/blueprintsprocessor/application/pom.xml @@ -38,9 +38,6 @@ <name.space>org.onap.ccsdk.cds</name.space> <serviceArtifactName>blueprintsprocessor</serviceArtifactName> <image.name>onap/ccsdk-blueprintsprocessor</image.name> - <docker.push.phase>deploy</docker.push.phase> - <docker.verbose>true</docker.verbose> - <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> </properties> <dependencies> @@ -339,7 +336,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> @@ -356,18 +353,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/blueprintsprocessor/application/src/main/docker/Dockerfile b/ms/blueprintsprocessor/application/src/main/docker/Dockerfile index 6326bb862..c4da384f5 100755 --- a/ms/blueprintsprocessor/application/src/main/docker/Dockerfile +++ b/ms/blueprintsprocessor/application/src/main/docker/Dockerfile @@ -9,7 +9,7 @@ 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@ + && rm -rf /tmp/@project.build.finalName@ \ && touch /velocity.log \ && chown onap:onap /velocity.log \ && chmod 755 /velocity.log \ diff --git a/ms/blueprintsprocessor/application/src/test/resources/logback-test.xml b/ms/blueprintsprocessor/application/src/test/resources/logback-test.xml index 90dfed324..ed1fb9d00 100644 --- a/ms/blueprintsprocessor/application/src/test/resources/logback-test.xml +++ b/ms/blueprintsprocessor/application/src/test/resources/logback-test.xml @@ -29,8 +29,8 @@ </sift> </appender> - <logger name="org.springframework.web.HttpLogging" level="trace"/> - <logger name="org.springframework.web.reactive.function.client.ExchangeFunctions" level="trace"/> + <logger name="org.springframework.web.HttpLogging" level="debug"/> + <logger name="org.springframework.web.reactive.function.client.ExchangeFunctions" level="debug"/> <!-- Helpful to optimize Spring Context caching to speed-up tests and prevent resorting to @DirtiesContext as much as possible --> @@ -39,7 +39,7 @@ <!-- Please refer to https://thoughts-on-java.org/hibernate-logging-guide/ for a lengthy discussion on good Hibernate logging practices --> <logger name="org.hibernate.SQL" level="debug"/> - <logger name="org.hibernate.type.descriptor.sql" level="trace"/> + <logger name="org.hibernate.type.descriptor.sql" level="debug"/> <logger name="org.apache.http" level="debug"/> <logger name="org.apache.http.wire" level="error"/> diff --git a/ms/blueprintsprocessor/pom.xml b/ms/blueprintsprocessor/pom.xml index f87ff14db..7db4c7dfa 100755 --- a/ms/blueprintsprocessor/pom.xml +++ b/ms/blueprintsprocessor/pom.xml @@ -40,10 +40,5 @@ <properties> <service.name>BlueprintsProcessor</service.name> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> - <build.number>${maven.build.timestamp}</build.number> - <ccsdk.cds.version>${project.version}</ccsdk.cds.version> </properties> </project> diff --git a/ms/command-executor/pom.xml b/ms/command-executor/pom.xml index eb5337973..441a22a5f 100755 --- a/ms/command-executor/pom.xml +++ b/ms/command-executor/pom.xml @@ -34,10 +34,6 @@ <properties> <assembly.id>maven</assembly.id> <image.name>onap/ccsdk-commandexecutor</image.name> - <docker.push.phase>deploy</docker.push.phase> - <docker.verbose>true</docker.verbose> - <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> - <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> </properties> <build> @@ -115,7 +111,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> @@ -132,18 +128,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/command-executor/src/main/docker/Dockerfile b/ms/command-executor/src/main/docker/Dockerfile index 5fc11814d..8f2f1a717 100644 --- a/ms/command-executor/src/main/docker/Dockerfile +++ b/ms/command-executor/src/main/docker/Dockerfile @@ -1,11 +1,6 @@ -FROM onap/integration-python:7.0.1 +FROM python:3.7-slim USER root -ENV GRPC_PYTHON_VERSION 1.20.0 - -RUN python -m pip install --upgrade pip -RUN pip install grpcio==${GRPC_PYTHON_VERSION} grpcio-tools==${GRPC_PYTHON_VERSION} -RUN pip install virtualenv==16.7.9 RUN mkdir -p /opt/app/onap/logs/ && touch /opt/app/onap/logs/application.log # add entrypoint @@ -18,10 +13,15 @@ RUN tar -xzf /source.tar.gz -C /tmp \ && rm -rf /source.tar.gz \ && rm -rf /tmp/@project.build.finalName@ \ && mkdir -p /opt/app/onap/blueprints/deploy \ - && chown onap:onap /opt -R \ && chmod 755 /opt/app/onap/command-executor/start.sh VOLUME /opt/app/onap/blueprints/deploy/ +RUN python -m pip install --upgrade pip setuptools +RUN pip install grpcio==1.20.0 grpcio-tools==1.20.0 +RUN pip install virtualenv==16.7.9 + +RUN groupadd -r -g 1000 onap && useradd -r -u 1000 -g onap onap +RUN chown onap:onap /opt -R USER onap ENTRYPOINT /opt/app/onap/command-executor/start.sh diff --git a/ms/pom.xml b/ms/pom.xml index 552750ab3..bc0131eb6 100644 --- a/ms/pom.xml +++ b/ms/pom.xml @@ -35,8 +35,8 @@ <modules> <module>error-catalog</module> <module>blueprintsprocessor</module> - <module>py-executor</module> <module>command-executor</module> + <module>py-executor</module> <module>sdclistener</module> </modules> diff --git a/ms/py-executor/docker/Dockerfile b/ms/py-executor/docker/Dockerfile index cdf416d9d..2fa699672 100644 --- a/ms/py-executor/docker/Dockerfile +++ b/ms/py-executor/docker/Dockerfile @@ -1,8 +1,6 @@ -FROM onap/integration-python:7.0.1 +FROM python:3.7-slim USER root -RUN python -m pip install --upgrade pip -RUN pip install --no-cache-dir -r /opt/app/onap/python/requirements/docker.txt RUN mkdir -p /opt/app/onap/logs/ && touch /opt/app/onap/logs/application.log # add entrypoint @@ -15,10 +13,14 @@ RUN tar -xzf /source.tar.gz -C /tmp \ && rm -rf /source.tar.gz \ && rm -rf /tmp/@project.build.finalName@ \ && mkdir -p /opt/app/onap/blueprints/deploy \ - && chown onap:onap /opt -R \ && chmod 755 /opt/app/onap/py-executor/start.sh VOLUME /opt/app/onap/blueprints/deploy/ +RUN python -m pip install --upgrade pip setuptools +RUN pip install --no-cache-dir -r /opt/app/onap/python/requirements/docker.txt + +RUN groupadd -r -g 1000 onap && useradd -r -u 1000 -g onap onap +RUN chown onap:onap /opt -R USER onap ENTRYPOINT /opt/app/onap/py-executor/start.sh diff --git a/ms/py-executor/pom.xml b/ms/py-executor/pom.xml index 9839c7185..747eeb7f9 100644 --- a/ms/py-executor/pom.xml +++ b/ms/py-executor/pom.xml @@ -32,10 +32,6 @@ <properties> <assembly.id>maven</assembly.id> <image.name>onap/ccsdk-py-executor</image.name> - <docker.push.phase>deploy</docker.push.phase> - <docker.verbose>true</docker.verbose> - <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> - <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> <sonar.skip>true</sonar.skip> </properties> @@ -114,7 +110,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> @@ -131,18 +127,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/pom.xml b/ms/sdclistener/distribution/pom.xml index ac241230b..f8b0110ac 100755 --- a/ms/sdclistener/distribution/pom.xml +++ b/ms/sdclistener/distribution/pom.xml @@ -37,9 +37,6 @@ <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.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> </properties> <dependencies> @@ -143,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> @@ -160,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/parent/pom.xml b/ms/sdclistener/parent/pom.xml index 93b694cde..9b79b8c61 100755 --- a/ms/sdclistener/parent/pom.xml +++ b/ms/sdclistener/parent/pom.xml @@ -43,7 +43,6 @@ <sdc-distribution-client.version>1.4.0</sdc-distribution-client.version> <jmockit.version>1.49</jmockit.version> <reactorcore.version>3.2.6.RELEASE</reactorcore.version> - <ccsdk.cds.version>${project.version}</ccsdk.cds.version> </properties> <dependencyManagement> diff --git a/ms/sdclistener/pom.xml b/ms/sdclistener/pom.xml index b46a68940..054f6a05a 100644 --- a/ms/sdclistener/pom.xml +++ b/ms/sdclistener/pom.xml @@ -38,10 +38,6 @@ <properties> <service.name>sdclistener</service.name> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> - <build.number>${maven.build.timestamp}</build.number> - <ccsdk.cds.version>${project.version}</ccsdk.cds.version> + </properties> </project> @@ -65,6 +65,13 @@ limitations under the License. <java.version>11</java.version> <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version> <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version> + + <!-- docker related properties --> + <docker.verbose>true</docker.verbose> + <docker.skip.push>false</docker.skip.push> + <docker.push.phase>deploy</docker.push.phase> + + <ccsdk.cds.version>${project.version}</ccsdk.cds.version> </properties> <build> |