try without

Author: syphar

.env.tests

@@ -17,6 +17,10 @@
 - unsure if the prefix mount should also be a docker volume, for performance.
   Not sure how often we actually have to look at the contents?
 
+## TODO
+
+- what is better, buildx cache mounts or just layer caching?
+
   ## docker image
 
 for now, these are production images, changing files will not auto-reload /

NOTES.md

@@ -69,6 +69,8 @@ x-healthcheck: &healthcheck-interval
     start_period: 10s
 
 x-environment: &environment
+    # FIXME: change to FOO: ${FOO:-default123 where these vars are just a 
+    # default that should be possible to override
     RUST_BACKTRACE: true
     DOCSRS_LOG: docs_rs=trace,tower_http=debug,rustwide=info,aws_smithy_http=trace,axum=debug
 
@@ -86,6 +88,15 @@ x-environment: &environment
     AWS_ACCESS_KEY_ID: cratesfyi
     AWS_SECRET_ACCESS_KEY: secret_key
 
+x-builder-environment: &builder-environment
+    <<: *environment
+    DOCSRS_RUSTWIDE_WORKSPACE: /opt/docsrs/rustwide
+    DOCSRS_COMPILER_METRICS_PATH: /opt/docsrs/prefix/metrics
+    DOCSRS_DOCKER: true
+    DOCSRS_DOCKER_IMAGE: ghcr.io/rust-lang/crates-build-env/linux-micro
+    DOCSRS_BUILD_CPU_LIMIT: 2
+    DOCSRS_INCLUDE_DEFAULT_TARGETS: false
+
 x-build: &build
     context: .
     <<: *docker-cache
@@ -107,13 +118,7 @@ x-builder: &builder
         - db
         - s3
     environment:
-        <<: *environment
-        DOCSRS_RUSTWIDE_WORKSPACE: /opt/docsrs/rustwide
-        DOCSRS_COMPILER_METRICS_PATH: /opt/docsrs/prefix/metrics
-        DOCSRS_DOCKER: true
-        DOCSRS_DOCKER_IMAGE: ghcr.io/rust-lang/crates-build-env/linux-micro
-        DOCSRS_BUILD_CPU_LIMIT: 2
-        DOCSRS_INCLUDE_DEFAULT_TARGETS: false
+        <<: *builder-environment
     env_file:
         - .docker.env
     healthcheck:

docker-compose.yml

@@ -147,6 +147,7 @@ CMD ["start-build-server", "0.0.0.0:3000"]
 
 COPY --from=build /artifacts/cratesfyi /usr/local/bin
 
+
 ############################
 #  Registry watcher stage  #
 ############################

dockerfiles/Dockerfile

@@ -77,23 +77,27 @@ run-tests: _ensure_db_and_s3_are_running _build-test-binaries
   #!/usr/bin/env bash
   set -euo pipefail
 
-  export $(grep -v '^#' .env.tests | xargs)
   export DOCSRS_INCLUDE_DEFAULT_TARGETS=false
   export DOCSRS_LOG=docs_rs=debug,rustwide=info
   export RUST_BACKTRACE=1
+  export DOCSRS_PREFIX=ignored/cratesfyi-prefix
+  export DOCSRS_DATABASE_URL=postgresql://cratesfyi:password@localhost:15432
+  export AWS_ACCESS_KEY_ID=cratesfyi
+  export AWS_SECRET_ACCESS_KEY=secret_key
+  export S3_ENDPOINT=http://localhost:9000
 
   cargo test --workspace --locked --no-fail-fast
 
 [group('testing')]
 [group('builder')]
-run-builder-tests: _ensure_db_and_s3_are_running _build-test-binaries
+run-builder-tests: _ensure_db_and_s3_are_running
   #!/usr/bin/env bash
   set -euo pipefail
 
-  export $(grep -v '^#' .env.tests | xargs)
   export DOCSRS_INCLUDE_DEFAULT_TARGETS=true
   export DOCSRS_DOCKER_IMAGE=ghcr.io/rust-lang/crates-build-env/linux-micro
   export DOCSRS_LOG=docs_rs=debug,rustwide=info
   export RUST_BACKTRACE=1
+  export DOCSRS_PREFIX=ignored/cratesfyi-prefix
 
   cargo test --locked -- --ignored --test-threads=1