Skip to content

Commit

Permalink
buildmaster: bump base container, fix pip invocation
Browse files Browse the repository at this point in the history
  • Loading branch information
kallisti5 committed Jan 8, 2025
1 parent ef7413b commit 14127d5
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions buildmaster/backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bullseye-slim AS host-tools
FROM debian:bookworm-slim AS host-tools

RUN apt-get update \
&& apt-get -y install git bc nasm texinfo flex bison gawk build-essential \
Expand All @@ -12,7 +12,7 @@ RUN git clone --depth 1 https://review.haiku-os.org/buildtools /tmp/buildtools \
&& jam -j2 -q \<build\>package \<build\>package_repo

#############################################################
FROM debian:bullseye-slim
FROM debian:bookworm-slim

# hardlink for build-packages
ADD https://cgit.haiku-os.org/haiku/plain/src/tools/hardlink_packages.py /usr/local/bin/
Expand All @@ -25,13 +25,13 @@ RUN apt-get update \
&& apt-get clean

RUN echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib' >> /etc/bash.bashrc \
&& wget https://github.com/jedisct1/minisign/releases/download/0.10/minisign-0.10-linux.tar.gz -O /tmp/minisign.tar.gz \
&& wget https://github.com/jedisct1/minisign/releases/download/0.11/minisign-0.11-linux.tar.gz -O /tmp/minisign.tar.gz \
&& cd /tmp && tar -xvz --strip=2 -f /tmp/minisign.tar.gz && mv minisign /usr/local/bin

# Haikuporter from local context root (this is where the weird context requirement comes from)
ADD . /tmp/haikuporter

RUN pip3 install /tmp/haikuporter \
RUN pip3 install /tmp/haikuporter --break-system-packages \
&& 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/ \
Expand Down
8 changes: 4 additions & 4 deletions buildmaster/backend/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# CAREFUL HERE! The build context is the top level directory of git!
#
REPO=ghcr.io/haikuports
VERSION=1.3.0-1
VERSION=1.3.0-2
default:
docker build --no-cache --tag ${REPO}/haikuporter/buildmaster:${VERSION} -f Dockerfile ../..
docker build --no-cache --tag ${REPO}/buildmaster:${VERSION} -f Dockerfile ../..
push:
docker push ${REPO}/haikuporter/buildmaster:${VERSION}
docker push ${REPO}/buildmaster:${VERSION}
enter:
docker run -it ${REPO}/haikuporter/buildmaster:${VERSION} /bin/bash -l
docker run -it ${REPO}/buildmaster:${VERSION} /bin/bash -l
8 changes: 4 additions & 4 deletions buildmaster/frontend/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
REPO=ghcr.io/haikuports
VERSION=1.3.0-1
VERSION=1.3.0-2
default:
docker build --no-cache --tag ${REPO}/haikuporter/frontend:${VERSION} .
docker build --no-cache --tag ${REPO}/frontend:${VERSION} .
push:
docker push ${REPO}/haikuporter/frontend:${VERSION}
docker push ${REPO}/frontend:${VERSION}
enter:
docker run -it ${REPO}/haikuporter/frontend:${VERSION} /bin/sh -l
docker run -it ${REPO}/frontend:${VERSION} /bin/sh -l

0 comments on commit 14127d5

Please sign in to comment.