[WIP] creation of an x86_64 build environment

Dockerfile

@@ -0,0 +1,12 @@
+FROM debian:jessie
+MAINTAINER Jonathan Passerat-Palmbach, Imperial College London <j.passerat-palmbach@imperial.ac.uk>
+
+RUN apt update && apt install -y build-essential gawk autoconf autotools-dev python cmake uthash-dev
+
+COPY . /opt/build/
+WORKDIR /opt/build
+
+RUN make -f GNUmakefile all_libs -j4
+
+CMD bash
+

GNUmakefile

@@ -23,9 +23,9 @@
 #			-q qemu-sh4
 #			make ...
 
-proot-version      = proot-v5.1.0
-care-version       = care-v2.2.1
-glibc-version      = glibc-2.16.0
+proot-version      = proot-v5.1.1
+care-version       = care-v2.2.2
+glibc-version      = glibc-2.19
 libtalloc-version  = talloc-2.1.1
 libarchive-version = libarchive-3.1.2
 libz-version       = zlib-1.2.8
@@ -159,14 +159,19 @@ care-licenses: $(all_libs_a)
 	@echo "" >> $@
 	@echo "    https://github.com/cedric-vincent/proot-static-build">> $@
 
+
+all_libs: $(all_libs_a)
+
 care: $(all_libs_a) care-licenses
 	tar -xzf $(packages)/$(care-version).tar.gz
 	cp care-licenses $(care-version)/src/licenses
 	env OBJECTS="cli/care-licenses.o" LDFLAGS="-static -L$(prefix)/lib -larchive -lz -llzo2" CPPFLAGS="-isystem $(prefix)/include -DCARE_BINARY_IS_PORTABLE " $(MAKE) -C $(care-version)/src/ care GIT=false
-	cp $(care-version)/src/$@ .
+	mkdir -p ./target
+	cp $(care-version)/src/$@ ./target/
 
 proot: $(libc_a) $(libtalloc_a) proot-licenses
 	tar -xzf $(packages)/$(proot-version).tar.gz
 	cp proot-licenses $(proot-version)/src/licenses
 	env OBJECTS="cli/proot-licenses.o" LDFLAGS="-static -L$(prefix)/lib" CPPFLAGS="-isystem $(prefix)/include" $(MAKE) -C $(proot-version)/src/ GIT=false
-	cp $(proot-version)/src/$@ .
+	mkdir -p ./target
+	cp $(proot-version)/src/$@ ./target/

README.md

@@ -5,6 +5,41 @@ PRoot static binaries were built using:
 
     https://github.com/proot-me/proot-static-build 
 
+
+## Docker build environment ##
+
+Build the Docker container:
+
+`docker build -t proot-buildenv .`
+
+Run a build 
+ `./build.sh make care proot -j4`
+
+This creates a `target` folder with both static binaries for care and proot.
+
+## Special variables
+
+If needed you can override the mountpoints within the container by prefixing the call to build.sh with these variables.
+
+### `VOLUMES`
+
+  - Must be formatted as Docker expects them -> `/path_on_host:/mountpoint`
+  - Specify multiple volumes using the `;` separator
+  - The target in the containers should not be changed unless the container itself has been rebuilt with different paths
+  - It is necessary to wrap the whole expression passed to the variable in `""`
+  - Example: `VOLUMES="/data/my_modified_proot.tar.gz:/opt/build/packages/proot-v5.1.1.tar.gz;/data/my_modified_care.tar.gz:/opt/build/packages/care-v2.2.2.tar.gz"`
+
+### `TARGET_DIR`
+
+  - This is the destination folder for static binaries
+  - Example: `TARGET_DIR=/tmp/mytarget`
+
+### Example of modified command line
+
+`VOLUMES=/data/my_modified_proot.tar.gz:/opt/build/packages/proot-v5.1.1.tar.gz;/data/my_modified_care.tar.gz:/opt/build/packages/care-v2.2.2.tar.gz TARGET_DIR=/tmp/mytarget ./build.sh make care proot -j4`
+
+## Legacy builds (pre 5.1.1)
+
 The ARM one was built on x86_64 using this command: 
 
     # Build PRoot/ARM statically: 
@@ -30,3 +65,4 @@ Where slackwarearm-14.1 was created this way:
 
     # Install all package correcty (ignore warnings): 
     ls ftp.arm.slackware.com/slackwarearm/slackwarearm-14.1/slackware/*/*.t?z | xargs -n 1 proot -q qemu-arm -S ~/rootfs/slackwarearm-14.1 -b ftp.arm.slackware.com installpkg 
+

build.sh

@@ -0,0 +1,67 @@
+#!/bin/bash
+
+### VARIABLES
+
+DOCKER_IMAGE='proot/proot-buildenv:latest'
+
+CONTAINER_USERNAME='dummy'
+CONTAINER_GROUPNAME='dummy'
+GROUP_ID=$(id -g)
+USER_ID=$(id -u)
+
+# must be an absolute path
+TARGET_DIR=${TARGET_DIR:-"$(pwd)/target"}
+
+# VOLUMES must be formatted as Docker expects them -> /path_on_host:/mountpoint
+# specify multiple volumes using the ; separator
+VOLUMES=${VOLUMES:-""}
+
+### FUNCTIONS
+
+create_user_cmd()
+{
+  if [[ ${USER_ID} -ne 0 ]]; then
+    echo \
+      groupadd -f -g ${GROUP_ID} ${CONTAINER_GROUPNAME} '&&' \
+      useradd -u ${USER_ID} -g ${GROUP_ID} ${CONTAINER_USERNAME} '&&' \
+      chown -R ${USER_ID}:${GROUP_ID} /opt/build
+  else
+    echo echo 'Running build as root...'
+  fi
+}
+
+mount_volumes() {
+
+  if [[ -n ${VOLUMES} ]]; then
+    echo -n "-v ${VOLUMES}" | sed -e 's/;/ -v /g'
+  fi
+
+}
+
+execute_as_cmd()
+{
+  if [[ ${USER_ID} -ne 0 ]]; then
+    echo \
+      su ${CONTAINER_USERNAME} -c
+  else
+    echo \
+      eval
+  fi
+}
+
+full_container_cmd()
+{
+  echo "'$(create_user_cmd) && $(execute_as_cmd) \"$@\"'"
+}
+
+### MAIN
+
+mkdir -p ${TARGET_DIR}
+eval docker run \
+    --rm=true \
+    -a stdout \
+    -v ${TARGET_DIR}:/opt/build/target $(mount_volumes) \
+    -w /opt/build \
+    ${DOCKER_IMAGE} \
+    /bin/bash -ci $(full_container_cmd $@)
+