Skip to content

Commit 6d311a8

Browse files
Clean up docker compose configuration files (#3138)
1 parent 27f9aa1 commit 6d311a8

2 files changed

Lines changed: 3 additions & 14 deletions

File tree

docker/docker-compose.postgres.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@ services:
33
environment:
44
DB_LOGIN: postgres
55
DB_PORT: 5432
6-
# Uncomment this section for production postgres installations.
7-
#worker:
8-
# environment:
9-
# DB_LOGIN: postgres
10-
# DB_PORT: 5432
11-
126
database:
137
image: postgres
148
environment:

docs/docker.md

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,9 @@ ctest
4242
## Configuration
4343

4444
### Why so many YAML files?
45-
You may have noticed that CDash's `docker compose` configuration is [split across multiple files](https://docs.docker.com/compose/extends/). The allows us to support various workflows (production vs. development, local vs MinIO storaage, etc) while minimizing code duplication.
45+
You may have noticed that CDash's `docker compose` configuration is [split across multiple files](https://docs.docker.com/compose/extends/). The allows us to support various workflows (production vs. development, local vs MinIO storage) while minimizing code duplication.
4646

47-
For example, to use MinIO instead of local storage, pass `-f docker/docker-compose.minioyml` to the `docker compose` commands mentioned in this document.
48-
49-
### Changing the default configuration
50-
To change the default database password, modify `DB_PASSWORD` in `docker/docker-compose.postgres.yml`.
51-
52-
Once you're happy with your changes, re-run `docker compose up` (with the appropriate`-f` flags) to build and run services for CDash and its database.
47+
For example, to use MinIO instead of local storage, pass `-f docker/docker-compose.minio.yml` to the `docker compose` commands mentioned in this document.
5348

5449
### Building from source
5550
If you would prefer to build your own Docker images for CDash, pass the `--build` option to your `docker compose up` command.
@@ -69,9 +64,9 @@ To set up a CDash production instance using docker compose, follow these steps:
6964
- `APP_URL=https://<my-cdash-url>`
7065
- `SSL_CERTIFICATE_FILE=</path/to/certs/cdash.pem>`
7166
- `SSL_CERTIFICATE_KEY_FILE=</path/to/certs/cdash.key>`
67+
- `DB_PASSWORD=<your desired database password>`
7268
- `NUM_WORKERS=<desired number of queue worker replicas, defaults to 1>`
7369
- `WORKER_MEMORY_LIMIT`: restart worker after parsing a job if it consumed more than this amount of memory (in MB). Default: 256.
74-
* For postgres only, edit `docker/docker-compose.postgres.yml` and uncomment the `worker` section.
7570
* Run this command to start your CDash containers:
7671
```bash
7772
docker compose --env-file .env \

0 commit comments

Comments
 (0)