From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EE30D158CBB for ; Mon, 8 May 2023 20:19:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29D1DE086B; Mon, 8 May 2023 20:19:35 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0F1A7E0874 for ; Mon, 8 May 2023 20:19:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 31416340E4F for ; Mon, 8 May 2023 20:19:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8FC6DA59 for ; Mon, 8 May 2023 20:19:32 +0000 (UTC) From: "Magnus Granberg" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Magnus Granberg" Message-ID: <1683576865.0d402a82fd38e399a0b8185734cd796d0215b5fc.zorry@gentoo> Subject: [gentoo-commits] proj/tinderbox-cluster:master commit in: docker/ X-VCS-Repository: proj/tinderbox-cluster X-VCS-Files: docker/GentooBuildbotWorkerLog.Dockerfile X-VCS-Directories: docker/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: 0d402a82fd38e399a0b8185734cd796d0215b5fc X-VCS-Branch: master Date: Mon, 8 May 2023 20:19:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7d0412fc-4ad4-4864-a624-b1694956bf23 X-Archives-Hash: 7492f5e77c7237c51c828ca84756731e commit: 0d402a82fd38e399a0b8185734cd796d0215b5fc Author: Magnus Granberg gentoo org> AuthorDate: Mon May 8 20:14:25 2023 +0000 Commit: Magnus Granberg gentoo org> CommitDate: Mon May 8 20:14:25 2023 +0000 URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=0d402a82 Use user buildbot for log image Signed-off-by: Magnus Granberg gentoo.org> docker/GentooBuildbotWorkerLog.Dockerfile | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/docker/GentooBuildbotWorkerLog.Dockerfile b/docker/GentooBuildbotWorkerLog.Dockerfile index a7c7af1..492be36 100644 --- a/docker/GentooBuildbotWorkerLog.Dockerfile +++ b/docker/GentooBuildbotWorkerLog.Dockerfile @@ -1,3 +1,6 @@ +# This docker file is use for the log parser and ebuild parser image +# Use stable arch and gentoo's experimental binhost + # name the portage image FROM gentoo/portage:latest as portage @@ -7,24 +10,27 @@ FROM gentoo/stage3:latest # copy the entire portage volume in COPY --from=portage /var/db/repos/gentoo /var/db/repos/gentoo -# Setup portage -# emerge needed deps buildbot-worker, psycopg, git and sqlalchemy -# get the needed buildbot-worker config +# Setup portage and emerge needed deps buildbot-worker, psycopg, git and sqlalchemy RUN echo -e "[binhost]\npriority = 9999\nsync-uri = https://gentoo.osuosl.org/experimental/amd64/binpkg/default/linux/17.1/x86-64/\n" | cat >> /etc/portage/binrepos.conf\ && echo 'EMERGE_DEFAULT_OPTS="--binpkg-respect-use=n --usepkg=y --getbinpkg=y --autounmask-write --autounmask-continue --autounmask-keep-keywords=y --autounmask-use=y"' | cat >> /etc/portage/make.conf\ && echo 'FEATURES="-ipc-sandbox -pid-sandbox -network-sandbox -usersandbox -mount-sandbox sandbox"' | cat >> /etc/portage/make.conf\ && echo 'FEATURES="${FEATURES} parallel-install parallel-fetch -merge-sync"' | cat >> /etc/portage/make.conf\ && echo 'FEATURES="${FEATURES} buildpkg"' | cat >> /etc/portage/make.conf\ && echo 'MAKEOPTS="-j8"' | cat >> /etc/portage/make.conf\ - && echo 'dev-vcs/git -webdev -gnome-keyring' | cat >> /etc/portage/package.use/git\ - && echo 'dev-util/buildbot-worker' | cat >> /etc/portage/package.accept_keywords/buildbot\ && echo 'dev-libs/glib' | cat >> /etc/portage/package.mask/git\ - && emerge -qv buildbot-worker sqlalchemy dev-python/psycopg rust-bin dev-vcs/git - #&& chown buildbot:buildbot /var/lib/buildbot_worker + && emerge -qv buildbot-worker sqlalchemy dev-python/psycopg:2 rust-bin dev-vcs/git + +# We don't need the gentoo repo any longer +RUN rm -R /var/db/repos/gentoo + +# run on buildbot user +RUN chown buildbot:buildbot /var/lib/buildbot_worker +USER buildbot -#FIXME: run worker as buildbot (git fail) -#USER buildbot WORKDIR /var/lib/buildbot_worker -RUN wget https://raw.githubusercontent.com/buildbot/buildbot/master/worker/docker/buildbot.tac +# Get the needed buildbot-worker config +# Change umask so portage can read the ebuilds in the repos +RUN wget https://raw.githubusercontent.com/buildbot/buildbot/master/worker/docker/buildbot.tac\ + && ( sed -i -e 's/umask = None/umask = 0o22/g' buildbot.tac 2>/dev/null || true ) ENTRYPOINT ["/usr/bin/buildbot-worker"] CMD ["start", "--nodaemon"]