diff --git a/README.md b/README.md index 0c84533d..64d8dff8 100644 --- a/README.md +++ b/README.md @@ -34,16 +34,16 @@ A multi-node cluster is for mass building large numbers of packages. ### Running buildmaster in a container with docker - - `docker pull haikuporter/buildmaster` + - `docker pull ghcr.io/haikuports/haikuporter/buildmaster` - `mkdir ~/buildmaster.x86` - - `docker run -v ~/buildmaster.x86:/data -it -e ARCH=x86 haikuporter/buildmaster` + - `docker run -v ~/buildmaster.x86:/data -it -e ARCH=x86 ghcr.io/haikuports/haikuporter/buildmaster` - Provision builders - `createbuilder -n test01 -H 127.0.0.1` - copy generated public key to builder - `builderctl health` - exit - Copy the packages from a nightly to ports/packages on the buildmaster - - `docker run -v ~/buildmaster.x86:/data -it -e ARCH=x86 haikuporter/buildmaster` + - `docker run -v ~/buildmaster.x86:/data -it -e ARCH=x86 ghcr.io/haikuports/haikuporter/buildmaster` - buildmaster everything buildmaster.x86 will persist between build runs. Feel free to exit, update, or diff --git a/buildmaster/backend/Dockerfile b/buildmaster/backend/Dockerfile index 3862d94a..4e4ac55d 100644 --- a/buildmaster/backend/Dockerfile +++ b/buildmaster/backend/Dockerfile @@ -30,6 +30,7 @@ RUN apt-get update \ && wget https://github.com/jedisct1/minisign/releases/download/0.10/minisign-0.10-linux.tar.gz -O /tmp/minisign.tar.gz \ && cd /tmp && tar -xvz --strip=2 -f /tmp/minisign.tar.gz && mv minisign /usr/local/bin \ && pip3 install /tmp/haikuporter \ + && echo "Bug #277 Fix" && cp /tmp/haikuporter/haikuporter.py /usr/local/bin/haikuporter \ && cp /tmp/haikuporter/buildmaster/backend/assets/bin/* /usr/local/bin/ \ && cp /tmp/haikuporter/buildmaster/backend/assets/bootstrap /bin/ \ && cp /tmp/haikuporter/buildmaster/backend/assets/loop /bin/ \ diff --git a/buildmaster/backend/Makefile b/buildmaster/backend/Makefile index ce062c99..eecd2851 100644 --- a/buildmaster/backend/Makefile +++ b/buildmaster/backend/Makefile @@ -2,7 +2,7 @@ # CAREFUL HERE! The build context is the top level directory of git! # REPO=ghcr.io/haikuports -VERSION=1.2.8-2 +VERSION=1.2.8-4 default: docker build --no-cache --tag ${REPO}/haikuporter/buildmaster:${VERSION} -f Dockerfile ../.. push: diff --git a/buildmaster/frontend/Makefile b/buildmaster/frontend/Makefile index 7922ba96..86ea5d30 100644 --- a/buildmaster/frontend/Makefile +++ b/buildmaster/frontend/Makefile @@ -1,5 +1,5 @@ REPO=ghcr.io/haikuports -VERSION=1.2.8-2 +VERSION=1.2.8-4 default: docker build --no-cache --tag ${REPO}/haikuporter/frontend:${VERSION} . push: