summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--certService/README.md5
-rw-r--r--certService/docker-compose.yml6
-rw-r--r--certService/helm/aaf-cert-service/resources/cmpServers.json6
3 files changed, 9 insertions, 8 deletions
diff --git a/certService/README.md b/certService/README.md
index 4780a904..e48dad53 100644
--- a/certService/README.md
+++ b/certService/README.md
@@ -45,7 +45,7 @@ docker build --build-arg VERSION=1.0.0-SNAPSHOT -t onap/org.onap.aaf.certservice
mvn clean install
```
-### Building Docker image and install the package into the local repository
+### Building Docker image and install the package into local repository
```
mvn clean install -P docker
```
@@ -61,7 +61,8 @@ docker run -p 8080:8080 --name aaf-certservice-api --mount type=bind,source=/<ab
```
### Running Docker container from docker-compose with EJBCA
-Docker-compose uses nexus image of certservice.
+Docker-compose uses a local image of certservice.
+Build a docker image locally before run docker compose command. See a section **Building Docker image and install the package into local repository**
```
docker-compose up
```
diff --git a/certService/docker-compose.yml b/certService/docker-compose.yml
index 3b071ace..97d187e0 100644
--- a/certService/docker-compose.yml
+++ b/certService/docker-compose.yml
@@ -2,9 +2,9 @@ version: "2.1"
services:
ejbca:
- image: primekey/ejbca-ce
+ image: primekey/ejbca-ce:6.15.2.5
hostname: cahostname
- container_name: mycontainer
+ container_name: aafcert-ejbca
ports:
- "80:8080"
- "443:8443"
@@ -26,7 +26,7 @@ services:
image: onap/org.onap.aaf.certservice.aaf-certservice-api:latest
volumes:
- ./helm/aaf-cert-service/resources/cmpServers.json:/etc/onap/aaf/certservice/cmpServers.json
- container_name: certservice
+ container_name: aafcert-service
ports:
- "8080:8080"
depends_on:
diff --git a/certService/helm/aaf-cert-service/resources/cmpServers.json b/certService/helm/aaf-cert-service/resources/cmpServers.json
index 921a51ea..d6557c52 100644
--- a/certService/helm/aaf-cert-service/resources/cmpServers.json
+++ b/certService/helm/aaf-cert-service/resources/cmpServers.json
@@ -2,7 +2,7 @@
"cmpv2Servers": [
{
"caName": "Client",
- "url": "http://mycontainer:8080/ejbca/publicweb/cmp/cmp",
+ "url": "http://aafcert-ejbca:8080/ejbca/publicweb/cmp/cmp",
"issuerDN": "CN=ManagementCA",
"caMode": "CLIENT",
"authentication": {
@@ -12,7 +12,7 @@
},
{
"caName": "RA",
- "url": "http://mycontainer:8080/ejbca/publicweb/cmp/cmpRA",
+ "url": "http://aafcert-ejbca:8080/ejbca/publicweb/cmp/cmpRA",
"issuerDN": "CN=ManagementCA",
"caMode": "RA",
"authentication": {
@@ -21,4 +21,4 @@
}
}
]
-} \ No newline at end of file
+}