[haiku-commits] Change in haiku[master]: docker/bootstrap: ensure work volume exec, fix dependencies

  • From: Gerrit <review@xxxxxxxxxxxxxxxxxxx>
  • To: waddlesplash <waddlesplash@xxxxxxxxx>, haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 21 May 2020 13:24:45 +0000

From Alex von Gluck IV <kallisti5@xxxxxxxxxxx>:

Alex von Gluck IV has uploaded this change for review. ( 
https://review.haiku-os.org/c/haiku/+/2763 ;)


Change subject: docker/bootstrap: ensure work volume exec, fix dependencies
......................................................................

docker/bootstrap: ensure work volume exec, fix dependencies

Change-Id: I8b8d3a2f3b5a09063b183dc355407908cc2640f6
---
M 3rdparty/docker/bootstrap/Dockerfile
M 3rdparty/docker/bootstrap/Dockerfile.fedora
M 3rdparty/docker/bootstrap/Makefile
3 files changed, 6 insertions(+), 6 deletions(-)



  git pull ssh://git.haiku-os.org:22/haiku refs/changes/63/2763/1

diff --git a/3rdparty/docker/bootstrap/Dockerfile 
b/3rdparty/docker/bootstrap/Dockerfile
index 78f071a..e5d2d43 100644
--- a/3rdparty/docker/bootstrap/Dockerfile
+++ b/3rdparty/docker/bootstrap/Dockerfile
@@ -11,7 +11,7 @@
        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
diff --git a/3rdparty/docker/bootstrap/Dockerfile.fedora 
b/3rdparty/docker/bootstrap/Dockerfile.fedora
index 3d42e13..ebb5f2f 100644
--- a/3rdparty/docker/bootstrap/Dockerfile.fedora
+++ b/3rdparty/docker/bootstrap/Dockerfile.fedora
@@ -11,7 +11,7 @@
        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
diff --git a/3rdparty/docker/bootstrap/Makefile 
b/3rdparty/docker/bootstrap/Makefile
index 271403a..986525f 100644
--- a/3rdparty/docker/bootstrap/Makefile
+++ b/3rdparty/docker/bootstrap/Makefile
@@ -13,10 +13,10 @@
        ${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

--
To view, visit https://review.haiku-os.org/c/haiku/+/2763
To unsubscribe, or for help writing mail filters, visit 
https://review.haiku-os.org/settings

Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: I8b8d3a2f3b5a09063b183dc355407908cc2640f6
Gerrit-Change-Number: 2763
Gerrit-PatchSet: 1
Gerrit-Owner: Alex von Gluck IV <kallisti5@xxxxxxxxxxx>
Gerrit-MessageType: newchange

Other related posts:

  • » [haiku-commits] Change in haiku[master]: docker/bootstrap: ensure work volume exec, fix dependencies - Gerrit