use ccache

diff --git a/.dockerignore b/.dockerignore
index 9845981babe68420b50ffafcfa281098011c844a..e50661e47973d7c3a3fe3d336586b01110a5819a 100644 (file)
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,4 @@
 cache/
+ccache/
 poldekconf/
 rpm/

diff --git a/Dockerfile b/Dockerfile
index db95495943a0cda8bd36b8e2dd030921a363af66..be259c7f38fa3de74d563aa2e619692aea9b03ee 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ RUN set -x \
        # first upgrade to latest
        && poldek --upgrade-dist \
        # install build deps
-       && poldek -u rpm-build perl-modules pwdutils coreutils util-linux git-core gawk sudo \
+       && poldek -u rpm-build perl-modules pwdutils coreutils util-linux git-core gawk sudo ccache-wrapper \
        # this will setup builder user
        && poldek -u pld-builder-chroot \
        # for builder -R
@@ -23,5 +23,7 @@ USER builder
 
 WORKDIR /home/services/builder
 
+COPY rpmmacros .rpmmacros
+
 # Use sleep to run forever
 CMD ["sleep", "infinity"]

diff --git a/docker-builder.sh b/docker-builder.sh
index 8fbfd9592d041bc8c77529566d1b0bc2c7db3fe8..73889fd825a122e8607a4d369bc39772435b71ea 100755 (executable)
--- a/docker-builder.sh
+++ b/docker-builder.sh
@@ -6,14 +6,15 @@ image=pld/cleanbuild
 
 name=cleanbuild-$package
 
-# cleanup
-docker kill $name && docker rm $name || :
-
-#topdir=$(rpm -E %_topdir)
 dir=$(pwd)
 topdir=$dir/rpm
 cache=$dir/cache
 home=/home/services/builder
+buildsize="4G"
+
+# cleanup first
+docker kill $name && docker rm $name || :
+
 install -d $topdir/bin $cache/poldek
 
 # start the container
@@ -21,7 +22,8 @@ docker run --name=$name -d \
        -v $topdir:$home/rpm \
        -v $dir:$home/cleanbuild \
        -v $cache/poldek:/var/cache/poldek \
-       --tmpfs $home/rpm/BUILD:rw,exec,nosuid,size=2G \
+       -v $dir/ccache/$package:/home/services/builder/.ccache \
+       --tmpfs $home/rpm/BUILD:rw,exec,nosuid,size=$buildsize \
        $image
 
 if [ ! -d $topdir/packages ]; then

diff --git a/rpmmacros b/rpmmacros
new file mode 100644 (file)
index 0000000..7eb4e99
--- /dev/null
+++ b/rpmmacros
@@ -0,0 +1,5 @@
+
+%ccache_prefix %{_libdir}/ccache/
+
+%__cc %{?ccache_prefix}%{_target_platform}-gcc
+%__cxx %{?ccache_prefix}%{_target_platform}-g++