customize

This commit is contained in:
AF 2023-08-05 17:23:58 +00:00
parent c8824cc43b
commit 76474a2773
3 changed files with 21 additions and 18 deletions

View File

@ -29,7 +29,7 @@ assert CLIENT_SECRET
c["workers"] = [ c["workers"] = [
worker.Worker("worker-rust-1-65", "pass", properties={"rust_version": "1.65"}), 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"] rust_workers = ["worker-rust-1-65"]

View File

@ -45,7 +45,10 @@ services:
rust-worker-1-65: rust-worker-1-65:
image: "buildbot-worker-parrrate-rust" image: "buildbot-worker-parrrate-rust"
build: ../worker build:
context: ../worker
args:
- RUST_VERSION_ARG=1.65
environment: environment:
BUILDMASTER: buildbot BUILDMASTER: buildbot
BUILDMASTER_PORT: 9989 BUILDMASTER_PORT: 9989
@ -55,20 +58,20 @@ services:
networks: networks:
- buildbot-worker - buildbot-worker
rust-worker-1-71: # rust-worker-1-71:
image: "buildbot-worker-parrrate-rust" # image: "buildbot-worker-parrrate-rust"
build: # build:
context: ../worker # context: ../worker
args: # args:
- RUST_VERSION=1.71 # - RUST_VERSION_ARG=1.71
environment: # environment:
BUILDMASTER: buildbot # BUILDMASTER: buildbot
BUILDMASTER_PORT: 9989 # BUILDMASTER_PORT: 9989
WORKERNAME: worker-rust-1-71 # WORKERNAME: worker-rust-1-71
WORKERPASS: pass # WORKERPASS: pass
WORKER_ENVIRONMENT_BLACKLIST: DOCKER_BUILDBOT* BUILDBOT_ENV_* BUILDBOT_1* WORKER_ENVIRONMENT_BLACKLIST # WORKER_ENVIRONMENT_BLACKLIST: DOCKER_BUILDBOT* BUILDBOT_ENV_* BUILDBOT_1* WORKER_ENVIRONMENT_BLACKLIST
networks: # networks:
- buildbot-worker # - buildbot-worker
nginx: nginx:
container_name: buildbot-nginx container_name: buildbot-nginx

View File

@ -1,5 +1,5 @@
ARG RUST_VERSION=1.65 ARG RUST_VERSION_ARG=1.65
FROM rust:${RUST_VERSION} FROM rust:${RUST_VERSION_ARG}
COPY worker-setup.sh worker-setup.sh COPY worker-setup.sh worker-setup.sh
RUN bash worker-setup.sh RUN bash worker-setup.sh
USER buildbot USER buildbot