hrev53206 adds 2 changesets to branch 'master'
old head: cb343bfe5941ec361bd8ac4b2b3a5e97c9219976
new head: 23c507bd15cde4f37857035ac2d882797cf7c965
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=23c507bd15cd+%5Ecb343bfe5941
----------------------------------------------------------------------------
4b0251ba5b8e: docker/bootstrap: Improve local code injection
Change-Id: Ib1961d829ef1418a9b64307c73a01bab3520279a
23c507bd15cd: docker/bootstrap: Add alternative fedora bootstrap container
Change-Id: I2e77f04a6b74858abf74a266a360dbf1dba4bed7
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 47 insertions(+), 1 deletion(-)
3rdparty/docker/bootstrap/Dockerfile.fedora | 45 +++++++++++++++++++++++++
3rdparty/docker/bootstrap/Makefile | 3 +-
############################################################################
Commit: 4b0251ba5b8ead322190d3e58974d80a1381707c
URL: https://git.haiku-os.org/haiku/commit/?id=4b0251ba5b8e
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Wed Jun 19 16:24:18 2019 UTC
docker/bootstrap: Improve local code injection
Change-Id: Ib1961d829ef1418a9b64307c73a01bab3520279a
----------------------------------------------------------------------------
diff --git a/3rdparty/docker/bootstrap/Makefile
b/3rdparty/docker/bootstrap/Makefile
index d67c4aa4d5..6605354c47 100644
--- a/3rdparty/docker/bootstrap/Makefile
+++ b/3rdparty/docker/bootstrap/Makefile
@@ -3,7 +3,8 @@ ENGINE=docker
# Example mounting source code directory into container
# (lets you "work on the code used to bootstrap" a bit easier)
-#EXTRA=-v $(HOME)/Code/haiku:/work/src/haiku
+SOURCES=$(HOME)/Code
+EXTRA=-v $(HOME)/haiku:/work/src/haiku -v
$(HOME)/buildtools:/work/src/buildtools
default:
${ENGINE} build . -t docker.io/haiku/bootstrap
############################################################################
Revision: hrev53206
Commit: 23c507bd15cde4f37857035ac2d882797cf7c965
URL: https://git.haiku-os.org/haiku/commit/?id=23c507bd15cd
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Wed Jun 19 16:25:05 2019 UTC
docker/bootstrap: Add alternative fedora bootstrap container
Change-Id: I2e77f04a6b74858abf74a266a360dbf1dba4bed7
----------------------------------------------------------------------------
diff --git a/3rdparty/docker/bootstrap/Dockerfile.fedora
b/3rdparty/docker/bootstrap/Dockerfile.fedora
new file mode 100644
index 0000000000..3d42e13df9
--- /dev/null
+++ b/3rdparty/docker/bootstrap/Dockerfile.fedora
@@ -0,0 +1,45 @@
+FROM fedora:latest
+
+RUN dnf update -y
+
+# Base Haiku requirements
+RUN dnf install -y git nasm texinfo flex bison wget uboot-tools \
+ gcc gcc-c++ make zlib-devel xorriso curl-devel byacc libtool \
+ byacc libstdc++-static mtools python36 libfdt bc patch unzip \
+ autoconf automake gettext-devel \
+ libstdc++-devel.x86_64 libstdc++-devel.i686 \
+ glibc-headers glibc-devel.x86_64 glibc-devel.i686
+
+# GCC requirements
+RUN dnf install -y python
+# zlib requirements
+RUN dnf install -y cmake
+# ICU requirements
+RUN dnf install -y pkg-config
+# texinfo requirements
+RUN dnf install -y ncurses-devel
+
+# Developer sundries (that won't impact bootstrap)
+RUN dnf install -y vim nano
+RUN echo "source /usr/share/vim/vim80/defaults.vim" > ~/.vimrc
+RUN echo "set mouse=" >> ~/.vimrc
+
+ENV GIT_BUILDTOOLS="https://review.haiku-os.org/buildtools";
+ENV GIT_HAIKU="https://review.haiku-os.org/haiku";
+ENV GIT_HAIKUPORTER="https://github.com/haikuports/haikuporter.git";
+ENV GIT_HAIKUPORTS="https://github.com/haikuports/haikuports.git";
+ENV GIT_HAIKUPORTS_CROSS="https://github.com/haikuports/haikuports.cross.git";
+
+ADD prep.sh /usr/local/bin/prep
+ADD crosstools.sh /usr/local/bin/crosstools
+ADD bootstrap.sh /usr/local/bin/bootstrap
+ADD haikuports_chroot.sh /usr/local/bin/haikuports_chroot
+ADD haikuports_build.sh /usr/local/bin/haikuports_build
+
+ENV WORKPATH="/work"
+ENV PATH="$PATH:$WORKPATH/bin"
+
+WORKDIR "/work"
+VOLUME ["/work"]
+
+ENTRYPOINT ["/bin/bash", "-c"]
