Enhancements for building/image size

* Updated to use ponyc master since cross compiling changes have been
  merged.
* Updated to add a "runtime" dockerfile that is smaller than full
  compile docker image.
* Makefile/dockerfile changes to support both debug and release builds.
* build.sh/ponyc changes to support running in "runtime" container
  and to support debug/release builds.

Only tested on Ubuntu linux via vagrant but should work elsewhere also.

Author: dipinhora

.gitignore

@@ -0,0 +1,2 @@
+build
+

Dockerfile

@@ -25,6 +25,7 @@ RUN dpkg --add-architecture armhf && \
     llvm-3.6 \
     llvm \
     zlib1g-dev \
+    curl \
     software-properties-common \
     libicu-dev:armhf \
     libncurses5-dev:armhf \
@@ -36,33 +37,47 @@ RUN dpkg --add-architecture armhf && \
     gcc-arm-linux-gnueabihf \
     g++-arm-linux-gnueabihf && \
     rm -rf /var/lib/apt/lists/* && \
-    apt-get clean
+    apt-get -y autoremove --purge && \
+    apt-get -y clean
+
+RUN mkdir -p /tmp/pcre-src && \
+    curl -SL -o /tmp/pcre-src/repo.tbz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-10.20.tar.bz2 && \
+    tar xf /tmp/pcre-src/repo.tbz2 -C /tmp/pcre-src && \
+    ln -s /tmp/pcre-src/*pcre* /tmp/pcre-src/pcre && \
+    cd /tmp/pcre-src/pcre && \
+    ./configure --prefix=/usr && \
+    make && \
+    make install && \
+    rm -r /tmp/pcre-src/*pcre*
+
+ARG PONYC_CONFIG=debug
+ENV PONYC_CONFIG ${PONYC_CONFIG}
 
 RUN rm -rf /build/*
 RUN mkdir -p /build/pony
 RUN mkdir -p /build/arm
 WORKDIR /build/arm
-RUN git  clone https://github.com/dipinhora/ponyc.git ponyc
+RUN git clone https://github.com/ponylang/ponyc.git ponyc
 
 WORKDIR /build/arm/ponyc
-RUN git checkout cross_compiling
 
 RUN CC=arm-linux-gnueabihf-gcc CXX=arm-linux-gnueabihf-g++ \
-    make arch=armv7-a bits=32 verbose=true libponyrt
+    make arch=armv7-a bits=32 config=${PONYC_CONFIG} libponyrt
 
 WORKDIR /build
-RUN git clone https://github.com/dipinhora/ponyc.git ponyc && \
+RUN git clone https://github.com/ponylang/ponyc.git ponyc && \
     cd /build/ponyc && \
-    git checkout cross_compiling && \
-    make verbose=true ponyc && \
-    make install && \
-    rm -rf /build/ponyc && rm -rf /build/pony
+    make config=${PONYC_CONFIG} ponyc && \
+    make config=${PONYC_CONFIG} test && \
+    rm -f /build/ponyc/build/${PONYC_CONFIG}/libgtest.a && \
+    rm -f /build/ponyc/build/${PONYC_CONFIG}/libponyc.tests && \
+    rm -f /build/ponyc/build/${PONYC_CONFIG}/libponyrt-pic.a && \
+    rm -rf /build/ponyc/build/${PONYC_CONFIG}/obj
 
-RUN mkdir /data
-WORKDIR /data
-COPY runasuser.sh /root/ 
-COPY build.sh /build/ 
-RUN chmod ugo+x /build/*.sh
-ENTRYPOINT ["/root/runasuser.sh"]
+RUN mkdir bin && \
+    cd bin && \
+    ln -s /build/ponyc/build/${PONYC_CONFIG}/ponyc .
 
+COPY runasuser.sh /root/
+ENTRYPOINT ["/root/runasuser.sh"]
 

Dockerfile.runtime

@@ -0,0 +1,25 @@
+FROM ubuntu:vivid
+MAINTAINER Markus Fix <[email protected]>
+
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    software-properties-common && \
+    add-apt-repository -y ppa:linaro-maintainers/toolchain && \
+# hack to make apt-get update not fail due to ppa not having proper Packages files
+    (apt-get update || true) && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    gcc-arm-linux-gnueabihf \
+    gcc && \
+    apt-get -y autoremove software-properties-common && \
+    rm -rf /var/lib/apt/lists/* && \
+    apt-get -y autoclean && \
+    apt-get -y autoremove --purge && \
+    apt-get -y clean
+
+COPY build /build
+
+RUN mkdir /data
+WORKDIR /data
+COPY runasuser.sh /root/ 
+COPY build.sh /build/ 
+RUN chmod ugo+x /build/*.sh
+ENTRYPOINT ["/root/runasuser.sh"]
+

Makefile

@@ -2,12 +2,18 @@ DOCKER_IMAGE_VERSION=0.0.1
 DOCKER_IMAGE_NAME=lispmeister/rpxp
 DOCKER_IMAGE_TAGNAME=$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_VERSION)
 
+current_dir = $(shell pwd)
+config ?= debug
+
 default: build
 
 print-%  : ; @echo $* = $($*)
 
 build:
-	docker build -t $(DOCKER_IMAGE_TAGNAME) .
+	docker build --build-arg PONYC_CONFIG=$(config) -t $(DOCKER_IMAGE_TAGNAME) .
+	docker run --rm -v $(current_dir):/build-export $(DOCKER_IMAGE_TAGNAME) -U `id -u -n` -u 1000 -G `id -g -n` -g 1000 cp -r /build $(pwd)/build-export
+	docker build -t $(DOCKER_IMAGE_TAGNAME) --file=./Dockerfile.runtime .
+	rm -rf build
 	docker tag -f $(DOCKER_IMAGE_TAGNAME) $(DOCKER_IMAGE_NAME):latest
 
 push:

build.sh

@@ -2,16 +2,17 @@
 
 module_name=$(basename `pwd`)
 
-ponyc --triple arm-unknown-linux-gnueabihf -robj
+/build/bin/ponyc --triple arm-unknown-linux-gnueabihf -robj
 
-arm-linux-gnueabihf-gcc -v \
+arm-linux-gnueabihf-gcc \
         -o ${module_name} \
         -O3 -march=armv7-a -flto -fuse-linker-plugin \
         -fuse-ld=gold \
         ${module_name}.o \
         -L"/usr/local/lib" \
         -L"/build/arm/ponyc/build/debug/" \
-        -L"/build/arm/ponyc/build/debug/../../packages" \
+        -L"/build/arm/ponyc/build/release/" \
+        -L"/build/arm/ponyc/packages" \
         -Wl,--start-group \
         -l"rt" \
         -Wl,--end-group  \

ponyc

@@ -6,4 +6,4 @@ docker run --rm -it -v $(pwd):$(pwd) -w $(pwd) lispmeister/rpxp \
        -u 1000 \
        -G `id -g -n` \
        -g 1000 \
-       ponyc "$@"
+       /build/bin/ponyc "$@"