diff --git a/master.cfg b/master.cfg index edc9897..24a3d76 100644 --- a/master.cfg +++ b/master.cfg @@ -82,7 +82,9 @@ c["builders"] = [] builderNames = [] -env = {"CARGO_TARGET_DIR": "/buildbot/_rust/radn-rs/target"} +CARGO_TARGET_DIR = "/buildbot/_rust/radn-rs/target" +env = {"CARGO_TARGET_DIR": CARGO_TARGET_DIR} +DOC_DIR = f"{CARGO_TARGET_DIR}/doc" factory = util.BuildFactory() factory.addStep( @@ -136,6 +138,13 @@ factory.addStep( env=env, ) ) +factory.addStep( + steps.DirectoryUpload( + workersrc=DOC_DIR, + masterdest="/buildbot_share/docs/rand-rs/", + url="https://radn.parrrate.ru/latest/docs/", + ) +) c["builders"].append( util.BuilderConfig(name="rustdoc", workernames=["worker-rust"], factory=factory) ) diff --git a/simple/Dockerfile.Nginx b/simple/Dockerfile.Nginx new file mode 100644 index 0000000..0d0952f --- /dev/null +++ b/simple/Dockerfile.Nginx @@ -0,0 +1,2 @@ +FROM nginx +COPY nginx-default.conf /etc/nginx/conf.d/default.conf diff --git a/simple/docker-compose.yml b/simple/docker-compose.yml index 52ff8d0..5b6ef46 100644 --- a/simple/docker-compose.yml +++ b/simple/docker-compose.yml @@ -5,6 +5,10 @@ networks: external: true buildbot-db: {} buildbot-worker: {} + buildbot-docs: {} + +volumes: + buildbot-docs: {} services: buildbot: @@ -27,6 +31,8 @@ services: - v6d - buildbot-db - buildbot-worker + volumes: + - buildbot-docs:/buildbot_share/docs/:rw db: env_file: @@ -48,3 +54,13 @@ services: WORKER_ENVIRONMENT_BLACKLIST: DOCKER_BUILDBOT* BUILDBOT_ENV_* BUILDBOT_1* WORKER_ENVIRONMENT_BLACKLIST networks: - buildbot-worker + + nginx: + container_name: buildbot-nginx + build: + context: . + dockerfile: Dockerfile.Nginx + networks: + v6d: {} + volumes: + - buildbot-docs:/buildbot_share/docs/:ro diff --git a/simple/nginx-default.conf b/simple/nginx-default.conf new file mode 100644 index 0000000..12fc63c --- /dev/null +++ b/simple/nginx-default.conf @@ -0,0 +1,21 @@ +server { + listen 80; + listen [::]:80; + server_name radn.parrrate.ru; + + location /docs { + root /buildbot_share/docs; + index index.html index.htm; + } + + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } +} + +server { + listen 80; + listen [::]:80; + server_name *.parrrate.ru; +}