services/pkg/buildbot{,-builder}: update to buildbot 4.1.0

void-linux · Nov 13, 2024 · 9210bf0 · 9210bf0
1 parent 4b7eed8
commit 9210bf0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/services/pkg/buildbot-builder/Dockerfile b/services/pkg/buildbot-builder/Dockerfile
@@ -1,23 +1,28 @@
-FROM ghcr.io/void-linux/void-glibc-full:20240526R1 AS build
+FROM ghcr.io/void-linux/void-glibc-full:latest AS build
 
 RUN xbps-install -Suy xbps && xbps-install -uy git go
-ARG GO_XBPS_SRC_VERSION=4c394976975f7e84062f56d437b41a0d48043792
+
+ARG GO_XBPS_SRC_VERSION=0411f1b69a21103ec39ae6b0160b47cfc2c3e880
+
 RUN env GOBIN=/usr/local/bin GOMODCACHE=/tmp/go \
     go install -v github.com/Duncaen/go-xbps-src/cmd/xbps-src-make@$GO_XBPS_SRC_VERSION
 
 FROM build AS buildbot-builder
 RUN xbps-install -Suy xbps && xbps-install -uy python3 tini git curl bash make rsync
 COPY --from=build /usr/local/bin/xbps-src-make /usr/local/bin/xbps-src-make
-RUN rm -rf /var/cache/xbps && \
+RUN rm -rf /var/cache/xbps /tmp/* && \
     groupadd --gid 418 void-builder && \
     useradd --uid 418 --gid 418 -G xbuilder -M -d /buildbot void-builder && \
     mkdir /venv /buildbot && \
     chown void-builder:void-builder /venv /buildbot
 USER void-builder
+
 # version must be synced with ../buildbot
+ARG BUILDBOT_VERSION=4.1.0
+
 RUN python3 -m venv /venv && \
 	/venv/bin/pip3 install wheel && \
-	/venv/bin/pip3 install 'buildbot-worker~=4.0.0'
+	/venv/bin/pip3 install 'buildbot-worker~='$BUILDBOT_VERSION
 WORKDIR /buildbot
 RUN mkdir -p /buildbot && \
     ln -sf /local/info /buildbot/info && \

diff --git a/services/pkg/buildbot/Dockerfile b/services/pkg/buildbot/Dockerfile
@@ -1,11 +1,14 @@
-FROM  ghcr.io/void-linux/void-glibc-full:20240526R1
+FROM  ghcr.io/void-linux/void-glibc-full:latest
+
+RUN xbps-install -Suy xbps && xbps-install -uy python3 tini git curl && rm -rf /var/cache/xbps /tmp/*
 
-RUN xbps-install -Suy xbps && xbps-install -uy python3 tini git curl
-ARG THEME_VERSION=v0.1.0
 # version must be synced with ../buildbot-worker
+ARG BUILDBOT_VERSION=4.1.0
+ARG THEME_VERSION=v0.1.0
+
 RUN python3 -m venv /venv && \
 	/venv/bin/pip3 install wheel && \
-	/venv/bin/pip3 install 'buildbot[tls,bundle]~=4.0.0' treq \
+	/venv/bin/pip3 install 'buildbot[tls,bundle]~='$BUILDBOT_VERSION \
 		buildbot-prometheus buildbot-netauth \
 		git+https://github.com/void-linux/buildbot-theme.git@$THEME_VERSION
 WORKDIR /buildbot