Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2025-01-18 12:38:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

docker/bootstrap: ensure work volume exec, fix dependencies

Browse Source 
Change-Id: I8b8d3a2f3b5a09063b183dc355407908cc2640f6
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2763
Reviewed-by: Alex von Gluck IV <kallisti5@unixzen.com>
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
This commit is contained in:
Alexander von Gluck IV 2020-05-20 20:22:00 -05:00 committed by waddlesplash
parent 13d66b6d24
commit 42f51416eb
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/docker/bootstrap/Dockerfile vendored
View File

@ -11,7 +11,7 @@ RUN apt-get install -y git nasm autoconf automake autopoint texinfo \
u-boot-tools util-linux device-tree-compiler bc
# GCC requirements
RUN apt-get install -y python
RUN apt-get install -y python3
# zlib requirements
RUN apt-get install -y cmake
# ICU requirements

2
3rdparty/docker/bootstrap/Dockerfile.fedora vendored
View File

@ -11,7 +11,7 @@ RUN dnf install -y git nasm texinfo flex bison wget uboot-tools \
glibc-headers glibc-devel.x86_64 glibc-devel.i686
# GCC requirements
RUN dnf install -y python
RUN dnf install -y python3
# zlib requirements
RUN dnf install -y cmake
# ICU requirements

8
3rdparty/docker/bootstrap/Makefile vendored
View File

@ -13,10 +13,10 @@ clean:
${ENGINE} ps -a -q --filter=ancestor=docker.io/haiku/bootstrap | xargs -I {} ${ENGINE} rm {}
${ENGINE} volume rm bootstrap_work
prep:
${ENGINE} run -v bootstrap_work:/work ${EXTRA} docker.io/haiku/bootstrap prep
${ENGINE} run -v bootstrap_work:/work:exec ${EXTRA} docker.io/haiku/bootstrap prep
crosstools:
${ENGINE} run -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work ${EXTRA} docker.io/haiku/bootstrap crosstools
${ENGINE} run -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work:exec ${EXTRA} docker.io/haiku/bootstrap crosstools
bootstrap:
${ENGINE} run -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work ${EXTRA} docker.io/haiku/bootstrap bootstrap
${ENGINE} run -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work:exec ${EXTRA} docker.io/haiku/bootstrap bootstrap
enter:
${ENGINE} run -it -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work ${EXTRA} docker.io/haiku/bootstrap /bin/bash -l
${ENGINE} run -it -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work:exec ${EXTRA} docker.io/haiku/bootstrap /bin/bash -l