From 9bf85a691367f92a2557b3aed0efe5842792dc5c Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@colivre.coop.br>
Date: Thu, 7 Jan 2016 11:59:51 -0200
Subject: [PATCH] docker/ci: improve build organization

---
 config/docker/ci/Dockerfile | 10 ++--------
 config/docker/ci/build      | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100755 config/docker/ci/build

diff --git a/config/docker/ci/Dockerfile b/config/docker/ci/Dockerfile
index 579e391..d9f890a 100644
--- a/config/docker/ci/Dockerfile
+++ b/config/docker/ci/Dockerfile
@@ -1,11 +1,5 @@
 FROM debian:jessie
 MAINTAINER Noosfero Development Team <noosfero-dev@listas.softwarelivre.org>
 
-RUN apt-get update && apt-get install -y sudo git
-RUN git clone --depth 1 https://gitlab.com/noosfero/noosfero.git /var/tmp/noosfero
-RUN cd /var/tmp/noosfero && ./script/set-apt-proxy
-RUN echo 'LANG=C.UTF-8' > /etc/default/locale
-RUN cd /var/tmp/noosfero && mkdir -p locale && ./script/quick-start
-RUN rm -rf /var/tmp/noosfero
-RUN apt-get clean
-RUN rm -f /etc/apt/apt.conf.d/01proxy
+COPY ./build /srv/build
+RUN /srv/build
diff --git a/config/docker/ci/build b/config/docker/ci/build
new file mode 100755
index 0000000..619e829
--- /dev/null
+++ b/config/docker/ci/build
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -ex
+
+# system-wide setup
+echo 'LANG=C.UTF-8' > /etc/default/locale
+
+# get code
+apt-get update
+apt-get install -y sudo git
+git clone --depth 1 https://gitlab.com/noosfero/noosfero.git /var/tmp/noosfero
+
+# install everything
+cd /var/tmp/noosfero
+./script/set-apt-proxy
+mkdir -p locale
+./script/quick-start
+
+# cleanup
+cd /
+rm -rf /var/tmp/noosfero
+apt-get clean
+rm -f /etc/apt/apt.conf.d/01proxy
+rm -rf /var/lib/apt/lists/*
--
libgit2 0.21.2