You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2021/04/06 15:38:58 UTC
[directory-fortress-core] branch relax updated: FC-291 - cleanup
This is an automated email from the ASF dual-hosted git repository.
smckinney pushed a commit to branch relax
in repository https://gitbox.apache.org/repos/asf/directory-fortress-core.git
The following commit(s) were added to refs/heads/relax by this push:
new 3189db0 FC-291 - cleanup
3189db0 is described below
commit 3189db0ccb647d77d945f61da3c114f9cf4aef9c
Author: Shawn McKinney <sm...@symas.com>
AuthorDate: Tue Apr 6 10:38:53 2021 -0500
FC-291 - cleanup
---
README-QUICKSTART-DOCKER-SLAPD.md | 12 +++++++-----
src/docker/openldap-for-apache-fortress-tests/README.md | 10 ++++++----
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/README-QUICKSTART-DOCKER-SLAPD.md b/README-QUICKSTART-DOCKER-SLAPD.md
index 84919be..198c2b5 100644
--- a/README-QUICKSTART-DOCKER-SLAPD.md
+++ b/README-QUICKSTART-DOCKER-SLAPD.md
@@ -85,12 +85,9 @@ docker pull apachedirectory/openldap-for-apache-fortress-tests
4. Run the docker container:
```
-CONTAINER_ID=$(docker run -d -P apachedirectory/openldap-for-apache-fortress-tests)
-CONTAINER_PORT=$(docker inspect --format='{{(index (index .NetworkSettings.Ports "389/tcp") 0).HostPort}}' $CONTAINER_ID)
-echo $CONTAINER_PORT
+docker run -d -p 32768:389 -P apachedirectory/openldap-for-apache-fortress-tests
```
- * The '$CONTAINER_PORT' value required for next step.
* Depending on your Docker setup, may need to run this step as root or sudo priv's.
5. Prepare your terminal for execution of maven commands.
@@ -121,7 +118,7 @@ ________________________________________________________________________________
1. From fortress core base folder, enter the following commands:
```
-mvn install -Dload.file=./ldap/setup/refreshLDAPData.xml
+mvn install -Dload.file=./ldap/setup/refreshLDAPData.xml -Dfortress.host=localhost -Dfortress.port=32768
```
*These will build the Directory Information Tree (DIT), create the config and data policies needed for the integration test to follow.*
@@ -232,6 +229,11 @@ CONTAINER_ID=$(docker run -d -P apachedirectory/openldap-for-apache-fortress-tes
CONTAINER_PORT=$(docker inspect --format='{{(index (index .NetworkSettings.Ports "389/tcp") 0).HostPort}}' $CONTAINER_ID)
echo $CONTAINER_PORT
```
+#### Or Run container with specified id and port mapping
+
+```
+docker run --name=openldap-fortress -d -p 32768:389 -P apachedirectory/openldap-for-apache-fortress-tests
+```
#### Go into the container
diff --git a/src/docker/openldap-for-apache-fortress-tests/README.md b/src/docker/openldap-for-apache-fortress-tests/README.md
index 0a71961..c68e4c9 100644
--- a/src/docker/openldap-for-apache-fortress-tests/README.md
+++ b/src/docker/openldap-for-apache-fortress-tests/README.md
@@ -24,13 +24,15 @@ This directory contains
* a `Dockerfile` for building a Docker image with preconfigured OpenLDAP for Apache Fortress
* a `run-tests.sh` script that start such a Docker container and executes the Fortress tests against it
-
Build image (run from fortress-core root folder)
- docker build -t apachedirectory/openldap-for-apache-fortress-tests -f src/docker/openldap-for-apache-fortress-tests/Dockerfile .
-
+```bash
+docker build -t apachedirectory/openldap-for-apache-fortress-tests -f src/docker/openldap-for-apache-fortress-tests/Dockerfile .
+```
Push image to docker hub:
- docker push apachedirectory/openldap-for-apache-fortress-tests
+```bash
+docker push apachedirectory/openldap-for-apache-fortress-tests
+```