[Notes] [Git][BuildGrid/buildgrid][mablanch/160-docker-compose-feed-bin] docker-compose.yml: Prefer an unamed instance for now

[Martin Blanchard <gitlab mg gitlab com>]

Title: GitLab

Martin Blanchard pushed to branch mablanch/160-docker-compose-feed-bin at BuildGrid / buildgrid

Commits:

• d414e57e
  by Martin Blanchard at 2019-02-22T15:45:38Z

  docker-compose.yml: Prefer an unamed instance for now
  
  Mostly because buildbox and thus the buildbox bot, used for sandboxed
  builds, does not have named instance support...
  
  https://gitlab.com/BuildGrid/buildgrid/issues/160
  

4 changed files:

• data/config/controller.conf
• data/config/storage.conf
• docker-compose.yml
• docs/source/installation.rst

Changes:

data/config/controller.conf

---

...	...	@@ -6,7 +6,7 @@ server:
6	6	description: >
7	7	Docker Compose controller configuration:
8	8	- Unauthenticated plain HTTP at :50051
9		- - Single instance: local
	9	+ - Single instance: [unamed]
10	10	- Expects a remote CAS at :50052
11	11	- Hosted services:
12	12	- ActionCache
...	...	@@ -19,14 +19,14 @@ monitoring:
19	19	enabled: false
20	20
21	21	instances:
22		- - name: local
	22	+ - name: ''
23	23	description: |
24		- The unique 'local' instance.
	24	+ The unique unamed instance.
25	25
26	26	storages:
27	27	- !remote-storage &data-store
28	28	url: http://storage:50052
29		- instance-name: local
	29	+ instance-name: ''
30	30
31	31	services:
32	32	- !action-cache &build-cache

data/config/storage.conf

---

...	...	@@ -6,7 +6,7 @@ server:
6	6	description: >
7	7	Docker Compose storage configuration:
8	8	- Unauthenticated plain HTTP at :50052
9		- - Single instance: local
	9	+ - Single instance: [unamed]
10	10	- On-disk data stored in /var
11	11	- Hosted services:
12	12	- ContentAddressableStorage
...	...	@@ -19,9 +19,9 @@ monitoring:
19	19	enabled: false
20	20
21	21	instances:
22		- - name: local
	22	+ - name: ''
23	23	description: |
24		- The unique 'local' instance.
	24	+ The unique unamed instance.
25	25
26	26	storages:
27	27	- !disk-storage &data-store

docker-compose.yml

---

...	...	@@ -58,10 +58,16 @@ services:
58	58	bots: # To be scaled horizontaly
59	59	image: buildgrid:local
60	60	command: [
61		- "bot", "--parent=local",
	61	+ "bot", "--parent=",
62	62	"--remote=http://controller:50051",
63	63	"--remote-cas=http://storage:50052",
64	64	"host-tools"]
	65	+ # "bot", "--parent=",
	66	+ # "--remote=http://controller:50051",
	67	+ # "--remote-cas=http://storage:50052",
	68	+ # "buildbox",
	69	+ # "--local-cas", "/var/lib/buildgrid/cache",
	70	+ # "--fuse-dir", "/mnt"]
65	71	privileged: true
66	72	volumes:
67	73	- type: volume

docs/source/installation.rst

---

...	...	@@ -168,7 +168,7 @@ Once completed, you can start a minimal grid by running:
168	168	- An execution and action-cache service available at
169	169	``http://localhost:50051``.
170	170	- An CAS service available at ``http://localhost:50052``.
171		- - A single ``local`` instance with one host-tools based worker bot attached.
	171	+ - A single unamed instance with one host-tools based worker bot attached.
172	172
173	173	.. hint::
174	174

—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.