summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xcps-application/pom.xml6
-rwxr-xr-xcps-parent/pom.xml6
-rw-r--r--csit/README.md2
-rw-r--r--docker-compose/README.md4
-rwxr-xr-xdocker-compose/docker-compose.yml18
5 files changed, 18 insertions, 18 deletions
diff --git a/cps-application/pom.xml b/cps-application/pom.xml
index 64921f633b..8c79666252 100755
--- a/cps-application/pom.xml
+++ b/cps-application/pom.xml
@@ -35,11 +35,11 @@
<properties>
<app>org.onap.cps.Application</app>
- <image.version>${project.version}</image.version>
<jib-maven-plugin.version>2.8.0</jib-maven-plugin.version>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
<minimum-coverage>0.7</minimum-coverage>
- <nexus.repository>nexus3.onap.org:10003/onap/</nexus.repository>
+ <base.image>${docker.repository.pull}onap/integration-java11:8.0.0</base.image>
+ <image.tag>${project.version}-${maven.build.timestamp}</image.tag>
</properties>
<dependencies>
@@ -127,7 +127,7 @@
<tags>
<tag>latest</tag>
</tags>
- <image>${nexus.repository}${image.name}:${image.version}-${maven.build.timestamp}</image>
+ <image>${docker.repository.push}onap/${image.name}:${image.tag}</image>
</to>
</configuration>
<executions>
diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml
index 06d6364b7d..3552c28c96 100755
--- a/cps-parent/pom.xml
+++ b/cps-parent/pom.xml
@@ -37,11 +37,11 @@
<properties>
<app>org.onap.cps.Application</app>
- <base.image>nexus3.onap.org:10001/onap/integration-java11:8.0.0</base.image>
<java.version>11</java.version>
<minimum-coverage>0.9</minimum-coverage>
<nexusproxy>https://nexus.onap.org</nexusproxy>
- <nexus.public.repo>nexus3.onap.org:10001/library/</nexus.public.repo>
+ <docker.repository.push>nexus3.onap.org:10003/</docker.repository.push>
+ <docker.repository.pull>nexus3.onap.org:10001/</docker.repository.pull>
<oparent.version>3.1.0</oparent.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
@@ -325,7 +325,7 @@
see https://www.testcontainers.org/features/configuration/#disabling-ryuk
-->
<TESTCONTAINERS_RYUK_DISABLED>true</TESTCONTAINERS_RYUK_DISABLED>
- <TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX>${nexus.public.repo}</TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX>
+ <TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX>${docker.repository.pull}library/</TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX>
</environmentVariables>
</configuration>
</plugin>
diff --git a/csit/README.md b/csit/README.md
index 56f007d9bb..2e8b5a4286 100644
--- a/csit/README.md
+++ b/csit/README.md
@@ -41,7 +41,7 @@ cd ~/<your_git_repo>/cps
Build a docker image (see also [docker-compose readme](../docker-compose/README.md) ) from your cps directory:
```bash
-mvn clean install -Dmaven.test.skip=true -Dnexus.repository=
+mvn clean install -Dmaven.test.skip=true -Ddocker.repository.push=
```
Execute test from current cps folder:
diff --git a/docker-compose/README.md b/docker-compose/README.md
index 0b84e0a567..6fa222908c 100644
--- a/docker-compose/README.md
+++ b/docker-compose/README.md
@@ -14,14 +14,14 @@ mvn clean install -Pcps-docker -Pncmp-docker -Pcps-ncmp-docker -Djib.skip
* Following command builds the JAR file and also generates the Docker image for all CPS components:
```bash
-mvn clean install -Pcps-docker -Pncmp-docker -Pcps-ncmp-docker -Dnexus.repository=
+mvn clean install -Pcps-docker -Pncmp-docker -Pcps-ncmp-docker -Ddocker.repository.push=
```
* Following command builds the JAR file and generates the Docker image for specified CPS component:
(with `<docker-profile>` being one of `cps-docker`, `ncmp-docker` or `cps-ncmp-docker`):
```bash
-mvn clean install -P<docker-profile> -Dnexus.repository=
+mvn clean install -P<docker-profile> -Ddocker.repository.push=
```
## Running Docker containers
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 8b6414eed3..f01d12da28 100755
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -21,13 +21,13 @@ version: "3.7"
services:
#cps-standalone:
# container_name: cps-service
- # image: cps-service:${VERSION}
- # volumes:
- # - "./application.yml:/app/resources/application.yml"
+ # image: onap/cps-service:${VERSION:-latest}
# ports:
# - "8881:8080"
# environment:
- # DB_HOST: ${DB_HOST}
+ # CPS_USERNAME: ${CPS_USERNAME:-cpsuser}
+ # CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!}
+ # DB_HOST: dbpostgresql
# DB_USERNAME: ${DB_USERNAME}
# DB_PASSWORD: ${DB_PASSWORD}
# restart: unless-stopped
@@ -36,13 +36,13 @@ services:
#ncmp-standalone:
# container_name: cps-ncmp
- # image: cps-ncmp:${VERSION}
- # volumes:
- # - "./application.yml:/app/resources/application.yml"
+ # image: onap/cps-ncmp:${VERSION:-latest}
# ports:
# - "8882:8080"
# environment:
- # DB_HOST: ${DB_HOST}
+ # CPS_USERNAME: ${CPS_USERNAME:-cpsuser}
+ # CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!}
+ # DB_HOST: dbpostgresql
# DB_USERNAME: ${DB_USERNAME}
# DB_PASSWORD: ${DB_PASSWORD}
# restart: unless-stopped
@@ -51,7 +51,7 @@ services:
cps-and-ncmp:
container_name: cps-and-ncmp
- image: cps-and-ncmp:${VERSION}
+ image: onap/cps-and-ncmp:${VERSION:-latest}
ports:
- "8883:8080"
environment: