diff options
Diffstat (limited to 'openecomp-be/dist')
3 files changed, 126 insertions, 112 deletions
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml b/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml index e3f5801266..924f8e2f47 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml +++ b/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml @@ -18,7 +18,12 @@ <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> @@ -51,115 +56,117 @@ <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> - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> + <executions> + <execution> + <id>copy-resources-war</id> + <phase>verify</phase> + <goals> + <goal>copy-resources</goal> + </goals> <configuration> - <apiVersion>1.23</apiVersion> - <registry>nexus3.onap.org:10001</registry> - <authConfig> - <pull> - <username>docker</username> - <password>docker</password> - </pull> - </authConfig> - <images> + <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> + + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> + <configuration> + <apiVersion>1.23</apiVersion> + <registry>${docker.registry}</registry> + <authConfig> + <pull> + <username>${docker.username}</username> + <password>${docker.password}</password> + </pull> + </authConfig> + <images> - <!-- Build backend image --> - <image> - <name>onap/${docker.image.name}</name> - <alias>${docker.image.name}</alias> - <build> - <cleanup>try</cleanup> - <dockerFileDir>${project.basedir}/artifacts</dockerFileDir> - <tags> - <tag>${docker.tag}</tag> - <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag> - </tags> - </build> - </image> - </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>${docker.tag}</tag> + <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</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> </configuration> - <executions> - <execution> - <id>clean-images</id> - <phase>pre-clean</phase> - <goals> - <goal>remove</goal> - </goals> - <configuration> - <removeAll>true</removeAll> - <image>onap/${docker.image.name}</image> - </configuration> - </execution> + </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> +</project> - <execution> - <id>push-images</id> - <phase>deploy</phase> - <goals> - <goal>push</goal> - </goals> - <configuration> - <image>onap/${docker.image.name}</image> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project>
\ No newline at end of file diff --git a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile index 526ab95024..76e1d2b154 100644 --- a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile +++ b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile @@ -4,6 +4,8 @@ COPY init_keyspaces.cql /root/ COPY init_schemas.cql /root/ +COPY alter_tables.cql /root/ + COPY startup.sh /root/ RUN chmod 770 /root/startup.sh 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 05d83776dc..c2cafd71d8 100644 --- a/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml +++ b/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml @@ -18,7 +18,12 @@ <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> @@ -57,15 +62,15 @@ <registry>nexus3.onap.org:10001</registry> <authConfig> <pull> - <username>docker</username> - <password>docker</password> + <username>${docker.username}</username> + <password>${docker.password}</password> </pull> </authConfig> <images> <!-- Build backend image --> <image> - <name>onap/${docker.image.name}</name> + <name>${docker.namespace}/${docker.image.name}</name> <alias>${docker.image.name}</alias> <build> <cleanup>try</cleanup> @@ -87,7 +92,7 @@ </goals> <configuration> <removeAll>true</removeAll> - <image>onap/${docker.image.name}</image> + <image>${docker.namespace}/${docker.image.name}</image> </configuration> </execution> @@ -106,7 +111,7 @@ <goal>push</goal> </goals> <configuration> - <image>onap/${docker.image.name}</image> + <image>${docker.namespace}/${docker.image.name}</image> </configuration> </execution> </executions> |