diff --git a/master.cfg b/master.cfg index 91d5c1e..e2b5bd8 100644 --- a/master.cfg +++ b/master.cfg @@ -29,7 +29,7 @@ assert CLIENT_SECRET c["workers"] = [ worker.Worker("worker-rust-1-65", "pass", properties={"rust_version": "1.65"}), - worker.Worker("worker-rust-1-71", "pass", properties={"rust_version": "1.71"}), + # worker.Worker("worker-rust-1-71", "pass", properties={"rust_version": "1.71"}), ] rust_workers = ["worker-rust-1-65"] diff --git a/simple/docker-compose.yml b/simple/docker-compose.yml index 6c24c40..b13afd3 100644 --- a/simple/docker-compose.yml +++ b/simple/docker-compose.yml @@ -45,7 +45,10 @@ services: rust-worker-1-65: image: "buildbot-worker-parrrate-rust" - build: ../worker + build: + context: ../worker + args: + - RUST_VERSION_ARG=1.65 environment: BUILDMASTER: buildbot BUILDMASTER_PORT: 9989 @@ -55,20 +58,20 @@ services: networks: - buildbot-worker - rust-worker-1-71: - image: "buildbot-worker-parrrate-rust" - build: - context: ../worker - args: - - RUST_VERSION=1.71 - environment: - BUILDMASTER: buildbot - BUILDMASTER_PORT: 9989 - WORKERNAME: worker-rust-1-71 - WORKERPASS: pass - WORKER_ENVIRONMENT_BLACKLIST: DOCKER_BUILDBOT* BUILDBOT_ENV_* BUILDBOT_1* WORKER_ENVIRONMENT_BLACKLIST - networks: - - buildbot-worker + # rust-worker-1-71: + # image: "buildbot-worker-parrrate-rust" + # build: + # context: ../worker + # args: + # - RUST_VERSION_ARG=1.71 + # environment: + # BUILDMASTER: buildbot + # BUILDMASTER_PORT: 9989 + # WORKERNAME: worker-rust-1-71 + # WORKERPASS: pass + # WORKER_ENVIRONMENT_BLACKLIST: DOCKER_BUILDBOT* BUILDBOT_ENV_* BUILDBOT_1* WORKER_ENVIRONMENT_BLACKLIST + # networks: + # - buildbot-worker nginx: container_name: buildbot-nginx diff --git a/worker/Dockerfile b/worker/Dockerfile index c8f5037..4eeaa20 100644 --- a/worker/Dockerfile +++ b/worker/Dockerfile @@ -1,5 +1,5 @@ -ARG RUST_VERSION=1.65 -FROM rust:${RUST_VERSION} +ARG RUST_VERSION_ARG=1.65 +FROM rust:${RUST_VERSION_ARG} COPY worker-setup.sh worker-setup.sh RUN bash worker-setup.sh USER buildbot