Skip to content

Commit eabe04f

Browse files
committed
notes
1 parent 92b9aff commit eabe04f

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

.docker.env.sample

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,7 @@ DOCSRS_DOCKER_IMAGE=ghcr.io/rust-lang/crates-build-env/linux-micro
66
# you can set this to the git sha of a try build:
77
# https://forge.rust-lang.org/infra/docs/rustc-ci.html#try-builds
88
DOCSRS_TOOLCHAIN=nightly
9+
10+
# for the registry watcher, automatically queued reqbuidls.
11+
DOCSRS_MAX_QUEUED_REBUILDS: 10
12+

docker-compose.yml

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,19 @@
3535
# while it doesn't matter for the rest of the services.
3636
# This means for example on a Mac, the layers will be
3737
# cached separately, once for `linux/amd64` and once for
38-
# `linux/arm64`.
39-
# Only alternative would be to build everything for `amd64`, but
40-
# that would imply a performance impact on the services that don't
41-
# need it.
38+
# `linux/arm64`, which increases build-time.
39+
#
4240
# * volumes: typically docker-native volumes are faster than mounts, but
4341
# sometimes annoying to inspect for debugging.
44-
#
4542
# For now we choose:
46-
#
4743
# * docker-native for DB, S3, rustwide workspace, crates.io index
48-
# * mounts for prefix, code mounts
49-
# * prometheus scrape config is set to collect from the web server, the
50-
# registry watcher, and the build servers. Scraping is not dynamic, so
51-
# the local prometheus server will try to fetch from all service
52-
# instances (web, watcher, builder), and just error in case the specific
53-
# server isn't accessible.
44+
# * mounts for prefix
45+
#
46+
# * prometheus scrape config is set to collect from the web server, the
47+
# registry watcher, and the build servers. Scraping is not dynamic, so
48+
# the local prometheus server will try to fetch from all service
49+
# instances (web, watcher, builder), and just error in case the specific
50+
# server isn't accessible.
5451

5552
x-docker-cache: &docker-cache
5653
# shared configuration to cache docker layers across CI runs.
@@ -69,7 +66,8 @@ x-healthcheck: &healthcheck-interval
6966
start_period: 10s
7067

7168
x-environment: &environment
72-
# default environment that can be overwritten in `.docker.env
69+
# needed default environment that can be overwritten in `.docker.env`
70+
# Example in `.docker.env.sample`
7371
RUST_BACKTRACE: ${RUST_BACKTRACE:-true}
7472
DOCSRS_LOG: ${DOCSRS_LOG:-docs_rs=trace,tower_http=debug,rustwide=info,aws_smithy_http=trace,axum=debug}
7573

@@ -86,7 +84,7 @@ x-environment: &environment
8684

8785
x-builder-environment: &builder-environment
8886
<<: *environment
89-
# default builder environment that can be overwritten in `.docker.env
87+
# default builder environment that can be overwritten in `.docker.env`
9088
DOCSRS_INCLUDE_DEFAULT_TARGETS: ${DOCSRS_INCLUDE_DEFAULT_TARGETS:-false}
9189
DOCSRS_DOCKER_IMAGE: ${DOCSRS_DOCKER_IMAGE:-ghcr.io/rust-lang/crates-build-env/linux-micro}
9290

@@ -141,7 +139,7 @@ x-registry-watcher: &registry-watcher
141139
# So we configure it to be separate from the prefix.
142140
# Also on a native docker volume for performance
143141
REGISTRY_INDEX_PATH: /opt/docsrs/crates.io-index
144-
# configure the rebuild-queuer
142+
# configure the rebuild-queuer,
145143
DOCSRS_MAX_QUEUED_REBUILDS: ${DOCSRS_MAX_QUEUED_REBUILDS:-10}
146144
env_file:
147145
- .docker.env
@@ -311,7 +309,7 @@ services:
311309
- "${PWD}:/build/out"
312310
profiles:
313311
# gui_tests should not be run as background daemon.
314-
# Just run via `just run-gui-tests`.
312+
# Run via `just run-gui-tests`.
315313
- manual
316314

317315
volumes:

0 commit comments

Comments
 (0)