Skip to content

Commit 118b81e

Browse files
sumanthravipatisumanthravipati
andauthored
MLE-4137: Docker Compose name changes commit (#261)
Co-authored-by: sumanthravipati <[email protected]>
1 parent ef7c80b commit 118b81e

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ The credentials for the admin user are configured using Docker secrets, and are
238238
## Single node MarkLogic Server on a single VM
239239
Single node configurations are used primarily on a development machine with a single user.
240240

241-
Create these files on your host machine: `marklogic-centos.yaml`, `mldb_admin_username.txt`, `mldb_admin_password.txt`, and `mldb_wallet_password.txt`. Run the example Docker commands from the same directory that the files were created.
241+
Create these files on your host machine: `marklogic-single-node.yaml`, `mldb_admin_username.txt`, `mldb_admin_password.txt`, and `mldb_wallet_password.txt`. Run the example Docker commands from the same directory that the files were created.
242242

243243
**marklogic-centos.yaml**
244244

@@ -309,7 +309,7 @@ volumes:
309309
Once the files are ready, run this command to start the MarkLogic Server container.
310310

311311
```
312-
$ docker-compose -f marklogic-centos.yaml up -d
312+
$ docker-compose -f marklogic-single-node.yaml up -d
313313
```
314314
The previous command starts a container running MarkLogic Server named "bootstrap".
315315

@@ -323,7 +323,7 @@ After the container is initialized, you can access the MarkLogic Query Console o
323323

324324
## Three node cluster on a single VM
325325

326-
The following is an example of a three-node MarkLogic server cluster created using Docker compose. Create these files on your host machine: `marklogic-cluster-centos.yaml`, `mldb_admin_username.txt`, and `mldb_admin_password.txt`. Run example Docker commands from the same directory where the files created.
326+
The following is an example of a three-node MarkLogic server cluster created using Docker compose. Create these files on your host machine: `marklogic-multi-node.yaml`, `mldb_admin_username.txt`, and `mldb_admin_password.txt`. Run example Docker commands from the same directory where the files created.
327327

328328
**marklogic-cluster-centos.yaml**
329329

@@ -429,7 +429,7 @@ volumes:
429429
Once the files have been created, run the following command to start the MarkLogic Server container:
430430

431431
```
432-
$ docker-compose -f marklogic-cluster-centos.yaml up -d
432+
$ docker-compose -f marklogic-multi-node.yaml up -d
433433
```
434434

435435
This command will start three Docker containers running MarkLogic Server, named "bootstrap_3n", "node2" and, "node3".
@@ -468,7 +468,7 @@ Using Docker secrets, username and password information are secured when transmi
468468
```
469469
$docker secret create mldb_wallet_password_v1 mldb_wallet_password_v1.txt
470470
```
471-
3. Create marklogic-multi-centos.yaml using below:
471+
3. Create marklogic-multi-node.yaml using below:
472472
```
473473
version: '3.6'
474474
services:
@@ -569,7 +569,7 @@ volumes:
569569
```
570570
4. Use the Docker stack command to deploy the cluster:
571571
```
572-
$docker stack deploy -c marklogic-multi-centos.yaml mlstack
572+
$docker stack deploy -c marklogic-multi-node.yaml mlstack
573573
```
574574
All the cluster nodes will now be up and running.
575575
Now that the nodes have been initialized, we rotate the secrets files to overwrite the initial secrets files.
@@ -943,7 +943,7 @@ This section describes the teardown process for clusters set up on a single VM u
943943
Resources such as containers, volumes, and networks that were created with compose command can be removed using this command:
944944

945945
```
946-
$ docker-compose -f marklogic-centos.yaml down
946+
$ docker-compose -f marklogic-single-node.yaml down
947947
```
948948

949949
### Remove volumes
File renamed without changes.

test/docker-tests.robot

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,26 +113,26 @@ Initialized MarkLogic container with config overrides
113113
[Teardown] Delete container
114114

115115
Single node compose example
116-
Start compose from ../docker-compose/marklogic-centos.yaml
116+
Start compose from ../docker-compose/marklogic-single-node.yaml
117117
Verify response for unauthenticated request with 8000 *Unauthorized*
118118
Verify response for unauthenticated request with 8001 *Unauthorized*
119119
Verify response for unauthenticated request with 8002 *Unauthorized*
120120
Verify response for authenticated request with 8000 *Query Console*
121121
Verify response for authenticated request with 8001 *No license key has been entered*
122122
Verify response for authenticated request with 8002 *Monitoring Dashboard*
123-
Compose logs should contain ../docker-compose/marklogic-centos.yaml *TZ is defined, setting timezone to Europe/Prague.*
123+
Compose logs should contain ../docker-compose/marklogic-single-node.yaml *TZ is defined, setting timezone to Europe/Prague.*
124124
Host count on port 8002 should be 1
125-
[Teardown] Delete compose from ../docker-compose/marklogic-centos.yaml
125+
[Teardown] Delete compose from ../docker-compose/marklogic-single-node.yaml
126126

127127
Single node compose example with special characters in secrets file
128-
Start compose from ../docker-compose/marklogic-centos.yaml ${SPEC CHARS ADMIN PASS}
128+
Start compose from ../docker-compose/marklogic-single-node.yaml ${SPEC CHARS ADMIN PASS}
129129
Verify response for unauthenticated request with 8000 *Unauthorized*
130130
Verify response for unauthenticated request with 8001 *Unauthorized*
131131
Verify response for unauthenticated request with 8002 *Unauthorized*
132132
Verify response for authenticated request with 8000 *Query Console* ${SPEC CHARS ADMIN PASS}
133133
Verify response for authenticated request with 8001 *No license key has been entered* ${SPEC CHARS ADMIN PASS}
134134
Verify response for authenticated request with 8002 *Monitoring Dashboard* ${SPEC CHARS ADMIN PASS}
135-
[Teardown] Delete compose from ../docker-compose/marklogic-centos.yaml
135+
[Teardown] Delete compose from ../docker-compose/marklogic-single-node.yaml
136136

137137
Single node compose with special characters in yaml
138138
Start compose from ../test/compose-test-1.yaml ${SPEC CHARS ADMIN PASS}
@@ -145,7 +145,7 @@ Single node compose with special characters in yaml
145145
[Teardown] Delete compose from ../test/compose-test-1.yaml
146146

147147
Three node compose example
148-
Start compose from ../docker-compose/marklogic-cluster-centos.yaml
148+
Start compose from ../docker-compose/marklogic-multi-node.yaml
149149
Verify response for unauthenticated request with 7100 *Unauthorized*
150150
Verify response for unauthenticated request with 7101 *Unauthorized*
151151
Verify response for unauthenticated request with 7102 *Unauthorized*
@@ -167,7 +167,7 @@ Three node compose example
167167
Host count on port 7102 should be 3
168168
Host count on port 7202 should be 3
169169
Host count on port 7302 should be 3
170-
[Teardown] Delete compose from ../docker-compose/marklogic-cluster-centos.yaml
170+
[Teardown] Delete compose from ../docker-compose/marklogic-multi-node.yaml
171171

172172
Two node compose example with node joining enode group
173173
Start compose from ./compose-test-6.yaml

0 commit comments

Comments
 (0)