diff options
| author |   vasraz <vasyl.razinkov@est.tech> | 2021-12-08 22:12:52 +0000 |
|---|---|---|
| committer | Vasyl Razinkov <vasyl.razinkov@est.tech> | 2021-12-09 09:44:10 +0000 |
| commit | 8b1002a99724180cc9c134a04a5eb0763fde872c (patch) | |
| tree | 8e1061f97b28c193d9448885eea3bb2be4f68077 /catalog-be-plugins | |
| parent | afa3fb50409b8c68e35db42e77a962b76702f8d9 (diff) | |
Improve fast-build profile
Remove docker build from 'fast-build' profile
Change-Id: I90b79bc05ecd159b5c6ff62f195507476dcdaa38
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3804
Diffstat (limited to 'catalog-be-plugins')
| -rw-r--r-- | catalog-be-plugins/backend-all-plugins/pom.xml | 141 | ||||
| -rw-r--r-- | catalog-be-plugins/backend-all-plugins/src/main/docker/backend-all-plugins/Dockerfile | 4 |
2 files changed, 76 insertions, 69 deletions
diff --git a/catalog-be-plugins/backend-all-plugins/pom.xml b/catalog-be-plugins/backend-all-plugins/pom.xml index 1a61d62b6a..2c3ebab1fa 100644 --- a/catalog-be-plugins/backend-all-plugins/pom.xml +++ b/catalog-be-plugins/backend-all-plugins/pom.xml @@ -20,8 +20,8 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>catalog-be-plugins</artifactId> <groupId>org.openecomp.sdc</groupId> @@ -43,6 +43,9 @@ limitations under the License. <profiles> <profile> <id>docker</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> <properties> <skip.staging.artifacts>true</skip.staging.artifacts> <docker.skip.build>false</docker.skip.build> @@ -50,71 +53,75 @@ limitations under the License. <docker.skip.push>false</docker.skip.push> <docker.skip>false</docker.skip> </properties> + <build> + <plugins> + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> + <configuration> + <verbose>${verbose}</verbose> + <apiVersion>${docker.api.version}</apiVersion> + <registry>${docker.registry}</registry> + <verbose>${verbose}</verbose> + <authConfig> + <pull> + <username>${docker.username}</username> + <password>${docker.password}</password> + </pull> + </authConfig> + <images> + <!-- Build backend image --> + <image> + <name>${docker.namespace}/sdc-backend-all-plugins</name> + <alias>sdc-backend-all-plugins</alias> + <build> + <cleanup>try</cleanup> + <dockerFile>backend-all-plugins/Dockerfile</dockerFile> + <tags> + <tag>latest</tag> + <tag> + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest + </tag> + <tag> + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp} + </tag> + </tags> + <assembly> + <descriptor> + backend-all-plugins/backend-all-plugins-files.xml + </descriptor> + <name>onap-sdc-backend-all-plugins</name> + </assembly> + </build> + </image> + </images> + </configuration> + <executions> + <execution> + <id>clean-images</id> + <phase>pre-clean</phase> + <goals> + <goal>remove</goal> + </goals> + </execution> + <execution> + <id>generate-images</id> + <phase>install</phase> + <goals> + <goal>build</goal> + </goals> + </execution> + <execution> + <id>push-images</id> + <phase>deploy</phase> + <goals> + <goal>push</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </profile> </profiles> - <build> - <plugins> - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <configuration> - <verbose>${verbose}</verbose> - <apiVersion>${docker.api.version}</apiVersion> - <registry>nexus3.onap.org:10001</registry> - <verbose>${verbose}</verbose> - <authConfig> - <pull> - <username>docker</username> - <password>docker</password> - </pull> - </authConfig> - <images> - <!-- Build backend image --> - <image> - <name>onap/sdc-backend-all-plugins</name> - <alias>sdc-backend-all-plugins</alias> - <build> - <cleanup>try</cleanup> - <dockerFile>backend-all-plugins/Dockerfile</dockerFile> - <tags> - <tag>latest</tag> - <tag> - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest - </tag> - <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag> - </tags> - <assembly> - <descriptor>backend-all-plugins/backend-all-plugins-files.xml</descriptor> - <name>onap-sdc-backend-all-plugins</name> - </assembly> - </build> - </image> - </images> - </configuration> - <executions> - <execution> - <id>clean-images</id> - <phase>pre-clean</phase> - <goals> - <goal>remove</goal> - </goals> - </execution> - <execution> - <id>generate-images</id> - <phase>install</phase> - <goals> - <goal>build</goal> - </goals> - </execution> - <execution> - <id>push-images</id> - <phase>deploy</phase> - <goals> - <goal>push</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> </project>
\ No newline at end of file diff --git a/catalog-be-plugins/backend-all-plugins/src/main/docker/backend-all-plugins/Dockerfile b/catalog-be-plugins/backend-all-plugins/src/main/docker/backend-all-plugins/Dockerfile index ca723094f1..159fde430e 100644 --- a/catalog-be-plugins/backend-all-plugins/src/main/docker/backend-all-plugins/Dockerfile +++ b/catalog-be-plugins/backend-all-plugins/src/main/docker/backend-all-plugins/Dockerfile @@ -1,3 +1,3 @@ -FROM onap/sdc-backend:latest +FROM ${docker.namespace}/sdc-backend:latest -COPY --chown=${JETTY_USER}:${JETTY_USER} onap-sdc-backend-all-plugins/etsi-nfv-nsd-csar-plugin.jar ${JETTY_BASE}/plugins/
\ No newline at end of file +COPY --chown=${JETTY_USER}:${JETTY_USER} onap-sdc-backend-all-plugins/etsi-nfv-nsd-csar-plugin.jar ${JETTY_BASE}/plugins/
\ No newline at end of file |