Commit 68462b2c authored by Frank Kolarek's avatar Frank Kolarek
Browse files

Renaming data/config files .conf --> .yml

Renaming the data/config/*.conf files to
data/config/*.yml to keep a cleaner and more consistent work environment. The one
file that remained untouched was nginx.conf which is not YAML.
parent aed8dc0c
......@@ -2,10 +2,10 @@
include buildgrid/_app/settings/reference.yml
# Data includes:
include data/config/*.conf
include data/config/*.yml
# Documentation includes:
include docs/source/data/*.conf
include docs/source/data/*.yml
include docs/source/*.rst
include docs/Makefile
......
......@@ -39,11 +39,11 @@ services:
image: buildgrid:local
command: [
"server", "start", "-vvv",
"/app/config/bazel.conf"]
"/app/config/bazel.yml"]
volumes:
- type: bind
source: ./data/config/bazel.conf
target: /app/config/bazel.conf
source: ./data/config/bazel.yml
target: /app/config/bazel.yml
- type: volume
source: data
target: /var/lib/buildgrid/store
......
......@@ -91,11 +91,11 @@ services:
image: buildgrid:local
command: [
"server", "start", "-vvv",
"/app/config/cache.conf"]
"/app/config/cache.yml"]
volumes:
- type: bind
source: ./data/config/cache.conf
target: /app/config/cache.conf
source: ./data/config/cache.yml
target: /app/config/cache.yml
ports:
- "50053:50053"
networks:
......@@ -108,11 +108,11 @@ services:
image: buildgrid:local
command: [
"server", "start", "-vvv",
"/app/config/controller.conf"]
"/app/config/controller.yml"]
volumes:
- type: bind
source: ./data/config/monitoring-controller.conf
target: /app/config/controller.conf
source: ./data/config/monitoring-controller.yml
target: /app/config/controller.yml
ports:
- "50051:50051"
depends_on:
......
......@@ -84,11 +84,11 @@ services:
image: buildgrid:local
command: [
"server", "start", "-vv",
"/app/config/s3-indexed-cas.conf"]
"/app/config/s3-indexed-cas.yml"]
volumes:
- type: bind
source: ./data/config/s3-indexed-cas.conf
target: /app/config/s3-indexed-cas.conf
source: ./data/config/s3-indexed-cas.yml
target: /app/config/s3-indexed-cas.yml
ports:
- "50052:50052"
networks:
......@@ -101,11 +101,11 @@ services:
image: buildgrid:local
command: [
"server", "start", "-vvv",
"/app/config/cache.conf"]
"/app/config/cache.yml"]
volumes:
- type: bind
source: ./data/config/cache.conf
target: /app/config/cache.conf
source: ./data/config/cache.yml
target: /app/config/cache.yml
ports:
- "50053:50053"
networks:
......@@ -116,11 +116,11 @@ services:
image: buildgrid:local
command: [
"server", "start", "-vvv",
"/app/config/controller.conf"]
"/app/config/controller.yml"]
volumes:
- type: bind
source: ./data/config/monitoring-controller.conf
target: /app/config/controller.conf
source: ./data/config/monitoring-controller.yml
target: /app/config/controller.yml
ports:
- "50051:50051"
depends_on:
......@@ -158,12 +158,12 @@ services:
command: [
"cleanup", "start", "-vv", "--high-watermark", "2G",
"--low-watermark", "1G", "--batch-size", "100M", "--sleep-interval",
"10", "/app/config/s3-indexed-cas.conf"
"10", "/app/config/s3-indexed-cas.yml"
]
volumes:
- type: bind
source: ./data/config/s3-indexed-cas.conf
target: /app/config/s3-indexed-cas.conf
source: ./data/config/s3-indexed-cas.yml
target: /app/config/s3-indexed-cas.yml
depends_on:
- minio
- database
......
......@@ -40,7 +40,7 @@ services:
image: buildgrid:local
command: [
"server", "start", "-vvv",
"/app/config/storage.conf"]
"/app/config/storage.yml"]
volumes:
- type: volume
source: data
......@@ -48,8 +48,8 @@ services:
volume:
nocopy: true
- type: bind
source: ./data/config/storage.conf
target: /app/config/storage.conf
source: ./data/config/storage.yml
target: /app/config/storage.yml
ports:
- "50052:50052"
networks:
......@@ -62,11 +62,11 @@ services:
image: buildgrid:local
command: [
"server", "start", "-vvv",
"/app/config/cache.conf"]
"/app/config/cache.yml"]
volumes:
- type: bind
source: ./data/config/cache.conf
target: /app/config/cache.conf
source: ./data/config/cache.yml
target: /app/config/cache.yml
ports:
- "50053:50053"
networks:
......@@ -79,11 +79,11 @@ services:
image: buildgrid:local
command: [
"server", "start", "-vvv",
"/app/config/controller.conf"]
"/app/config/controller.yml"]
volumes:
- type: bind
source: ./data/config/controller.conf
target: /app/config/controller.conf
source: ./data/config/controller.yml
target: /app/config/controller.yml
expose:
- "50051"
depends_on:
......@@ -97,11 +97,11 @@ services:
image: buildgrid:local
command: [
"server", "start", "-vvv",
"/app/config/bots-interface.conf"]
"/app/config/bots-interface.yml"]
volumes:
- type: bind
source: ./data/config/bots-interface.conf
target: /app/config/bots-interface.conf
source: ./data/config/bots-interface.yml
target: /app/config/bots-interface.yml
expose:
- "50054"
depends_on:
......
......@@ -98,9 +98,9 @@ Once completed, you can start a simple grid by running:
container, no need to rebuild the base image on configuration update.
Configuration files are read from:
- ``data/config/controller.conf`` for the Execution service.
- ``data/config/storage.conf`` for the CAS service.
- ``data/config/cache.conf`` for the ActionCache service
- ``data/config/controller.yml`` for the Execution service.
- ``data/config/storage.yml`` for the CAS service.
- ``data/config/cache.yml`` for the ActionCache service
Minimal Docker Compose
~~~~~~~~~~~~~~~~~~~~~~
......@@ -142,7 +142,7 @@ Once completed, you can start a simple grid by running:
The configuration file is bind mounted into the container, no need to rebuild
the base image on configuration update. Configuration files are read from:
- ``data/config/bazel.conf`` for the BuildGrid services.
- ``data/config/bazel.yml`` for the BuildGrid services.
Interactive Development with tox
......@@ -159,7 +159,7 @@ run a simple BuildGrid server, we provide the "server" environment:
tox -e server
This will install the virtualenv and then run ``bgd server start
data/config/default.conf -vvv`` within that env. For the bot, you can start a
data/config/default.yml -vvv`` within that env. For the bot, you can start a
host-tools bot using tox:
.. code-block:: sh
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment