Skip to content

Commit 8fb5332

Browse files
committed
try fixes
1 parent 52e52aa commit 8fb5332

File tree

4 files changed

+30
-11
lines changed

4 files changed

+30
-11
lines changed

.dockerignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,18 @@
22
/.rustwide
33
/.rustwide-docker
44
/Justfile
5+
/justfiles/
56
/LICENSE
67
/README.md
78
/docker-compose.yml
9+
/dockerfiles/
810
/docs/
911
/ignored
1012
/mcps
1113
/triagebot.toml
1214
/clippy.toml
15+
/.env
16+
/.env.*
17+
/.envrc
18+
/.docker.env
19+
archive_cache

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ target
1111
.vagrant
1212
.rustwide
1313
.rustwide-docker
14-
.archive_cache
14+
archive_cache
1515
.workspace

docker-compose.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,10 @@ x-builder: &builder
9898
build:
9999
<<: *build
100100
target: build-server
101-
# builders only work with linux/amd64
101+
# build servers only work with linux/amd64 for now.
102+
# This makes them much slower when working on a mac, but
103+
# it needs some work and digging into the builder to fix
104+
# this.
102105
platform: "linux/amd64"
103106
depends_on:
104107
- db
@@ -125,7 +128,6 @@ x-registry-watcher: &registry-watcher
125128
- db
126129
- s3
127130
volumes:
128-
- "./static:/opt/docsrs/static:ro"
129131
- "./ignored/docker-registry-watcher/prefix:/opt/docsrs/prefix"
130132
- crates-io-index:/opt/docsrs/crates.io-index
131133
environment:
@@ -175,13 +177,16 @@ services:
175177
registry-watcher-cli:
176178
<<: *registry-watcher
177179
profiles:
180+
# watcher-CLI should not be run as background daemon, just manually
178181
- manual
179182

180183
builder-a:
181184
<<: *builder
182185
volumes:
183186
- "rustwide-builder-a:/opt/docsrs/rustwide"
184187
- "./ignored/docker-builder-a/prefix:/opt/docsrs/prefix"
188+
# this exposes the docker engine from the host machine
189+
# to the build-server inside the container.
185190
- "/var/run/docker.sock:/var/run/docker.sock"
186191
profiles:
187192
- builder
@@ -192,27 +197,32 @@ services:
192197
volumes:
193198
- "rustwide-builder-b:/opt/docsrs/rustwide"
194199
- "./ignored/docker-builder-b/prefix:/opt/docsrs/prefix"
200+
# this exposes the docker engine from the host machine
201+
# to the build-server inside the container.
195202
- "/var/run/docker.sock:/var/run/docker.sock"
196203
profiles:
197-
- builderaaa
204+
- builder
198205
- full
199206

200207
builder-cli:
201208
<<: *builder
202209
volumes:
203210
- "rustwide-builder-cli:/opt/docsrs/rustwide"
204211
- "./ignored/docker-builder-cli/prefix:/opt/docsrs/prefix"
212+
# this exposes the docker engine from the host machine
213+
# to the build-server inside the container.
205214
- "/var/run/docker.sock:/var/run/docker.sock"
206215
profiles:
216+
# builder-CLI should not be run as background daemon, just manually
207217
- manual
208218

209219
cli:
210220
build:
211221
<<: *build
212222
target: cli
213223
depends_on:
214-
# only for clarifycation.
215-
# when using "docker compose run", these dependencies are ignored,
224+
# only for clarification.
225+
# When using "docker compose run", these dependencies are ignored,
216226
# we handle this in our `just` commands.
217227
- db
218228
- s3
@@ -296,6 +306,8 @@ services:
296306
volumes:
297307
- "${PWD}:/build/out"
298308
profiles:
309+
# gui_tests should not be run as background daemon.
310+
# Just run via `just run-gui-tests`.
299311
- manual
300312

301313
volumes:

justfiles/testing.just

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ lint-js *args:
4343
deno run -A npm:eslint@9 static templates gui-tests eslint.config.js {{ args }}
4444

4545
run-gui-tests: ensure_db_and_s3_are_running cli-db-migrate compose-up-web
46-
just cli-build-update-toolchain
47-
just cli-build-crate sysinfo 0.23.4
48-
just cli-build-crate sysinfo 0.23.5
49-
just cli-build-crate libtest 0.0.1
50-
just cli-build-add-essential-files
46+
# just cli-build-update-toolchain
47+
# just cli-build-crate sysinfo 0.23.4
48+
# just cli-build-crate sysinfo 0.23.5
49+
# just cli-build-crate libtest 0.0.1
50+
# just cli-build-add-essential-files
5151

5252
just _cli gui_tests

0 commit comments

Comments
 (0)