Skip to content

Commit

Permalink
buildmaster: Workaround bug #277; fix image locations in docs
Browse files Browse the repository at this point in the history
* Ensure haikuporter cli is in path until tools.poetry is a little
  less melancholy
  • Loading branch information
kallisti5 committed Nov 1, 2023
1 parent 248f074 commit d6b1790
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions buildmaster/backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/ \
Expand Down
2 changes: 1 addition & 1 deletion buildmaster/backend/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion buildmaster/frontend/Makefile
Original file line number Diff line number Diff line change
@@ -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:
Expand Down

0 comments on commit d6b1790

Please sign in to comment.