diff options
Diffstat (limited to 'vnfmarket-be')
4 files changed, 14 insertions, 14 deletions
diff --git a/vnfmarket-be/deployment/docker/docker-postgres/pom.xml b/vnfmarket-be/deployment/docker/docker-postgres/pom.xml index b274e01e..eb0b88c3 100644 --- a/vnfmarket-be/deployment/docker/docker-postgres/pom.xml +++ b/vnfmarket-be/deployment/docker/docker-postgres/pom.xml @@ -31,7 +31,7 @@ <packaging>pom</packaging> <properties> - <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format> + <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> <docker.push.registry></docker.push.registry> <skip.docker.build>true</skip.docker.build> <skip.docker.tag>true</skip.docker.tag> @@ -57,7 +57,7 @@ <skipDocker>${docker.skip}</skipDocker> <images> <image> - <name>onap/refrepo/postgres</name> + <name>onap/vnfsdk/refrepo/postgres</name> <alias>postgres</alias> <build> <cleanup>try</cleanup> @@ -77,7 +77,7 @@ </goals> <configuration> <removeAll>true</removeAll> - <image>onap/refrepo/postgres</image> + <image>onap/vnfsdk/refrepo/postgres</image> </configuration> </execution> @@ -99,7 +99,7 @@ <goal>push</goal> </goals> <configuration> - <image>onap/refrepo/postgres</image> + <image>onap/vnfsdk/refrepo/postgres</image> </configuration> </execution> </executions> diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml index a6ca68e0..fb8f274f 100644 --- a/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml +++ b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml @@ -31,7 +31,7 @@ <packaging>pom</packaging> <properties> - <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format> + <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> <docker.push.registry></docker.push.registry> <skip.docker.build>true</skip.docker.build> <skip.docker.tag>true</skip.docker.tag> @@ -48,7 +48,7 @@ <version>1.0.0</version> <configuration> <verbose>true</verbose> - <imageName>onap/refrepo</imageName> + <imageName>onap/vnfsdk/refrepo</imageName> <serverId>docker-hub</serverId> <dockerDirectory>${basedir}/src/main/docker</dockerDirectory> <resources> @@ -80,8 +80,8 @@ <goal>tag</goal> </goals> <configuration> - <image>onap/refrepo</image> - <newName>${docker.push.registry}/onap/refrepo:${project.version}-${maven.build.timestamp}</newName> + <image>onap/vnfsdk/refrepo</image> + <newName>${docker.push.registry}/onap/vnfsdk/refrepo:${project.version}-${maven.build.timestamp}</newName> <pushImage>${skip.docker.push}</pushImage> <skipDockerTag>${skip.docker.tag}</skipDockerTag> </configuration> @@ -93,8 +93,8 @@ <goal>tag</goal> </goals> <configuration> - <image>onap/refrepo</image> - <newName>${docker.push.registry}/onap/refrepo:latest</newName> + <image>onap/vnfsdk/refrepo</image> + <newName>${docker.push.registry}/onap/vnfsdk/refrepo:latest</newName> <pushImage>${skip.docker.push}</pushImage> <skipDockerTag>${skip.docker.tag}</skipDockerTag> </configuration> diff --git a/vnfmarket-be/deployment/install/docker-compose.yml b/vnfmarket-be/deployment/install/docker-compose.yml index 75f31c20..00e26fb0 100644 --- a/vnfmarket-be/deployment/install/docker-compose.yml +++ b/vnfmarket-be/deployment/install/docker-compose.yml @@ -9,7 +9,7 @@ services: postgres: container_name: "postgres" restart: "always" - image: "${NEXUS_REPO}/onap/refrepo/postgres:${POSTGRES_TAG}" + image: "${NEXUS_REPO}/onap/vnfsdk/refrepo/postgres:${POSTGRES_TAG}" mem_limit: "1g" memswap_limit: "1g" ports: @@ -18,7 +18,7 @@ services: refrepo: container_name: "refrepo" restart: "always" - image: "${NEXUS_REPO}/onap/refrepo:${REFREPO_TAG}" + image: "${NEXUS_REPO}/onap/vnfsdk/refrepo:${REFREPO_TAG}" ports: - "8702-8703:8702-8703" - "8000:8000" diff --git a/vnfmarket-be/deployment/install/vnfsdk_vm_init.sh b/vnfmarket-be/deployment/install/vnfsdk_vm_init.sh index e1db6b5a..a3bcba8a 100755 --- a/vnfmarket-be/deployment/install/vnfsdk_vm_init.sh +++ b/vnfmarket-be/deployment/install/vnfsdk_vm_init.sh @@ -22,8 +22,8 @@ source .env # Refresh images docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO -docker pull $NEXUS_DOCKER_REPO/onap/refrepo:${REFREPO_TAG} -docker pull $NEXUS_DOCKER_REPO/onap/refrepo:${POSTGRES_TAG} +docker pull $NEXUS_DOCKER_REPO/onap/vnfsdk/refrepo:${REFREPO_TAG} +docker pull $NEXUS_DOCKER_REPO/onap/vnfsdk/refrepo:${POSTGRES_TAG} # docker-compose is not in /usr/bin |