diff options
Diffstat (limited to 'openecomp-be')
3 files changed, 283 insertions, 275 deletions
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile index f8d33d0248..012ebeec52 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile @@ -27,7 +27,7 @@ RUN mkdir $JETTY_FOLDER && chown onap:onap $JETTY_FOLDER USER onap #Download jetty -RUN wget https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.4.41.v20210516/jetty-distribution-9.4.41.v20210516.tar.gz -O $JETTY_FOLDER/jetty.tar.gz && \ +RUN wget https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty.version}/jetty-distribution-${jetty.version}.tar.gz -O $JETTY_FOLDER/jetty.tar.gz && \ tar xvz -C $JETTY_FOLDER -f $JETTY_FOLDER/jetty.tar.gz --strip 1 && \ rm -rf $JETTY_FOLDER/jetty.tar.gz RUN sed -i 's/"jetty"/"onap"/g' $JETTY_FOLDER/etc/jetty-setuid.xml diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml b/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml index ca63d0236f..ddf1f9f598 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml +++ b/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml @@ -1,5 +1,5 @@ <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <name>openecomp-sdc-docker-backend</name> @@ -18,159 +18,163 @@ <properties> <docker.image.name>sdc-onboard-backend</docker.image.name> - <docker.registry>nexus3.onap.org:10001</docker.registry> - <docker.password>docker</docker.password> - <docker.username>docker</docker.username> - <docker.namespace>onap</docker.namespace> </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <executions> - <execution> - <id>clean files</id> - <phase>clean</phase> - <goals> - <goal>clean</goal> - </goals> - <configuration> - <filesets> - <fileset> - <directory>${project.basedir}/artifacts/</directory> - <followSymlinks>false</followSymlinks> - <includes> - <include>*.war</include> - <include>onboarding_configuration.yaml</include> - <include>logback.xml</include> - </includes> - </fileset> - </filesets> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>3.0.2</version> - <executions> - <execution> - <id>copy-resources-war</id> - <phase>verify</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.basedir}/artifacts</outputDirectory> - <resources> - <resource> - <directory> - ${project.parent.basedir}/../../openecomp-be/tools/swagger-ui/target/api-docs - </directory> - <includes> - <include>api-docs.war</include> - </includes> - </resource> - <resource> - <directory> - ${project.parent.basedir}/../../openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/target - </directory> - <includes> - <include>onboarding-be-${project.version}.war</include> - </includes> - </resource> - <resource> - <directory> - ${project.parent.basedir}/../../openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/src/main/resources - </directory> - <includes> - <include>onboarding_configuration.yaml</include> - </includes> - </resource> - <resource> - <directory> - ${project.parent.basedir}/../../catalog-be/src/main/resources/config - </directory> - <includes> - <include>logback.xml</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> + <profiles> + <profile> + <id>docker</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <executions> + <execution> + <id>clean files</id> + <phase>clean</phase> + <goals> + <goal>clean</goal> + </goals> + <configuration> + <filesets> + <fileset> + <directory>${project.basedir}/artifacts/</directory> + <followSymlinks>false</followSymlinks> + <includes> + <include>*.war</include> + <include>onboarding_configuration.yaml</include> + <include>logback.xml</include> + </includes> + </fileset> + </filesets> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <configuration> - <verbose>${verbose}</verbose> - <apiVersion>${docker.api.version}</apiVersion> - <registry>${docker.registry}</registry> - <authConfig> - <pull> - <username>${docker.username}</username> - <password>${docker.password}</password> - </pull> - </authConfig> - <images> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>3.0.2</version> + <executions> + <execution> + <id>copy-resources-war</id> + <phase>verify</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.basedir}/artifacts</outputDirectory> + <resources> + <resource> + <directory> + ${project.parent.basedir}/../../openecomp-be/tools/swagger-ui/target/api-docs + </directory> + <includes> + <include>api-docs.war</include> + </includes> + </resource> + <resource> + <directory> + ${project.parent.basedir}/../../openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/target + </directory> + <includes> + <include>onboarding-be-${project.version}.war</include> + </includes> + </resource> + <resource> + <directory> + ${project.parent.basedir}/../../openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/src/main/resources + </directory> + <includes> + <include>onboarding_configuration.yaml</include> + </includes> + </resource> + <resource> + <directory> + ${project.parent.basedir}/../../catalog-be/src/main/resources/config + </directory> + <includes> + <include>logback.xml</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> - <!-- Build backend image --> - <image> - <name>${docker.namespace}/${docker.image.name}</name> - <alias>${docker.image.name}</alias> - <build> - <cleanup>try</cleanup> - <dockerFileDir>${project.basedir}/artifacts</dockerFileDir> - <tags> - <tag>latest</tag> - <tag> - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest - </tag> - <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag> - </tags> - </build> - </image> - </images> - </configuration> - <executions> - <execution> - <id>clean-images</id> - <phase>pre-clean</phase> - <goals> - <goal>remove</goal> - </goals> + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> <configuration> - <removeAll>true</removeAll> - <image>${docker.namespace}/${docker.image.name}</image> + <verbose>${verbose}</verbose> + <apiVersion>${docker.api.version}</apiVersion> + <registry>${docker.registry}</registry> + <authConfig> + <pull> + <username>${docker.username}</username> + <password>${docker.password}</password> + </pull> + </authConfig> + <images> + + <!-- Build backend image --> + <image> + <name>${docker.namespace}/${docker.image.name}</name> + <alias>${docker.image.name}</alias> + <build> + <cleanup>try</cleanup> + <dockerFileDir>${project.basedir}/artifacts</dockerFileDir> + <tags> + <tag>latest</tag> + <tag> + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest + </tag> + <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag> + </tags> + </build> + </image> + </images> </configuration> - </execution> + <executions> + <execution> + <id>clean-images</id> + <phase>pre-clean</phase> + <goals> + <goal>remove</goal> + </goals> + <configuration> + <removeAll>true</removeAll> + <image>${docker.namespace}/${docker.image.name}</image> + </configuration> + </execution> - <execution> - <id>generate-images</id> - <phase>install</phase> - <goals> - <goal>build</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> - <configuration> - <image>${docker.namespace}/${docker.image.name}</image> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <execution> + <id>push-images</id> + <phase>deploy</phase> + <goals> + <goal>push</goal> + </goals> + <configuration> + <image>${docker.namespace}/${docker.image.name}</image> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> diff --git a/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml b/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml index 67e0bbe23b..5f8d4acc4c 100644 --- a/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml +++ b/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml @@ -1,5 +1,5 @@ <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <name>openecomp-sdc-docker-db-init</name> @@ -17,137 +17,141 @@ <properties> <docker.image.name>sdc-onboard-cassandra-init</docker.image.name> - <docker.namespace>onap</docker.namespace> - <docker.password>docker</docker.password> - <docker.username>docker</docker.username> - <docker.registry>nexus3.onap.org:10001</docker.registry> </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <executions> - <execution> - <id>clean-docker-artifacts</id> - <phase>clean</phase> - <goals> - <goal>clean</goal> - </goals> - <configuration> - <filesets> - <fileset> - <directory> - artifacts - </directory> - <followSymlinks>false</followSymlinks> - <includes> - <include>init_keyspaces.cql</include> - <include>init_schemas.cql</include> - <include>upgrade-scripts/**</include> - </includes> - </fileset> - </filesets> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>3.0.2</version> - <executions> - <execution> - <id>copy-resources-war</id> - <phase>verify</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.basedir}/artifacts</outputDirectory> - <resources> - <resource> - <directory> - ${project.parent.basedir}/../../openecomp-be/tools/install/database - </directory> - <includes> - <include>init_keyspaces.cql</include> - <include>init_schemas.cql</include> - <include>upgrade-scripts/**</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> + <profiles> + <profile> + <id>docker</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <executions> + <execution> + <id>clean-docker-artifacts</id> + <phase>clean</phase> + <goals> + <goal>clean</goal> + </goals> + <configuration> + <filesets> + <fileset> + <directory> + artifacts + </directory> + <followSymlinks>false</followSymlinks> + <includes> + <include>init_keyspaces.cql</include> + <include>init_schemas.cql</include> + <include>upgrade-scripts/**</include> + </includes> + </fileset> + </filesets> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>3.0.2</version> + <executions> + <execution> + <id>copy-resources-war</id> + <phase>verify</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.basedir}/artifacts</outputDirectory> + <resources> + <resource> + <directory> + ${project.parent.basedir}/../../openecomp-be/tools/install/database + </directory> + <includes> + <include>init_keyspaces.cql</include> + <include>init_schemas.cql</include> + <include>upgrade-scripts/**</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <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> - <authConfig> - <pull> - <username>${docker.username}</username> - <password>${docker.password}</password> - </pull> - </authConfig> - <images> - - <!-- Build backend image --> - <image> - <name>${docker.namespace}/${docker.image.name}</name> - <alias>${docker.image.name}</alias> - <build> - <cleanup>try</cleanup> - <dockerFileDir>${project.basedir}/artifacts</dockerFileDir> - <tags> - <tag>latest</tag> - <tag> - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest - </tag> - <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag> - </tags> - </build> - </image> - </images> - </configuration> - <executions> - <execution> - <id>clean-images</id> - <phase>pre-clean</phase> - <goals> - <goal>remove</goal> - </goals> <configuration> - <removeAll>true</removeAll> - <image>${docker.namespace}/${docker.image.name}</image> + <verbose>${verbose}</verbose> + <apiVersion>${docker.api.version}</apiVersion> + <registry>${docker.registry}</registry> + <authConfig> + <pull> + <username>${docker.username}</username> + <password>${docker.password}</password> + </pull> + </authConfig> + <images> + + <!-- Build backend image --> + <image> + <name>${docker.namespace}/${docker.image.name}</name> + <alias>${docker.image.name}</alias> + <build> + <cleanup>try</cleanup> + <dockerFileDir>${project.basedir}/artifacts</dockerFileDir> + <tags> + <tag>latest</tag> + <tag> + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest + </tag> + <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag> + </tags> + </build> + </image> + </images> </configuration> - </execution> + <executions> + <execution> + <id>clean-images</id> + <phase>pre-clean</phase> + <goals> + <goal>remove</goal> + </goals> + <configuration> + <removeAll>true</removeAll> + <image>${docker.namespace}/${docker.image.name}</image> + </configuration> + </execution> - <execution> - <id>generate-images</id> - <phase>install</phase> - <goals> - <goal>build</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> - <configuration> - <image>${docker.namespace}/${docker.image.name}</image> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <execution> + <id>push-images</id> + <phase>deploy</phase> + <goals> + <goal>push</goal> + </goals> + <configuration> + <image>${docker.namespace}/${docker.image.name}</image> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project>
\ No newline at end of file |