Builder prepared for travis?

APSL · Jul 26, 2016 · aa801de · aa801de
1 parent 889ca5a
commit aa801de
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/builder b/builder
@@ -7,15 +7,18 @@ docker run --rm -v "$(pwd)"/wheelhouse:/wheelhouse builder
 
 echo "Launch Pypiserver"
 docker-compose -f docker-compose-travis.yml up -d pypiserver 
+docker ps -a
+
+export DOCKERHOST=$(ip route | awk '/docker/ { print $NF }')
 
 echo "--> BUILDING apsl/thumbor"
-docker build -f thumbor/Dockerfile -t apsl/thumbor thumbor/
+docker build --build-arg DOCKERHOST=$DOCKERHOST -f thumbor/Dockerfile -t apsl/thumbor thumbor/
 echo "--> TAGGING apsl/thumbor:$THUMBOR_VERSION"
 docker tag apsl/thumbor apsl/thumbor:$THUMBOR_VERSION
 docker tag apsl/thumbor apsl/thumbor:latest
 
 echo "--> BUILDING apsl/thumbor-multiprocess"
-docker build -f thumbor-multiprocess/Dockerfile -t apsl/thumbor-multiprocess thumbor-multiprocess/
+docker build --build-arg DOCKERHOST=$DOCKERHOST -f thumbor-multiprocess/Dockerfile -t apsl/thumbor-multiprocess thumbor-multiprocess/
 echo "--> TAGGING apsl/thumbor-multiprocess:$THUMBOR_VERSION"
 docker tag apsl/thumbor-multiprocess apsl/thumbor-multiprocess:$THUMBOR_VERSION
 docker tag apsl/thumbor-multiprocess apsl/thumbor-multiprocess:latest
@@ -27,7 +30,7 @@ docker tag apsl/thumbor-nginx apsl/thumbor-nginx:$THUMBOR_VERSION
 docker tag apsl/thumbor-nginx apsl/thumbor-nginx:latest
 
 echo "--> BUILDING apsl/remotecv"
-docker build -f remotecv/Dockerfile -t apsl/remotecv remotecv/
+docker build --build-arg DOCKERHOST=$DOCKERHOST -f remotecv/Dockerfile -t apsl/remotecv remotecv/
 echo "--> TAGGING apsl/remotecv:$THUMBOR_VERSION"
 docker tag apsl/remotecv apsl/remotecv:$THUMBOR_VERSION
 docker tag apsl/remotecv apsl/remotecv:latest
diff --git a/remotecv/Dockerfile b/remotecv/Dockerfile
@@ -18,10 +18,12 @@ ENV SHELL bash
 ENV WORKON_HOME /usr/src/app
 WORKDIR /usr/src/app
 
+ARG DOCKERHOST=172.17.0.1
+ENV DOCKERHOST ${DOCKERHOST}
 COPY requirements.txt /usr/src/app/requirements.txt
 RUN pip install --trusted-host None --no-cache-dir --use-wheel \
-   --extra-index-url http://172.17.0.1:9009/simple/ \
-   --trusted-host 172.17.0.1 \
+   --extra-index-url http://${DOCKERHOST}:9009/simple/ \
+   --trusted-host ${DOCKERHOST} \
    -r /usr/src/app/requirements.txt
 
 RUN \ 

diff --git a/thumbor-multiprocess/Dockerfile b/thumbor-multiprocess/Dockerfile
@@ -2,10 +2,12 @@ FROM apsl/thumbor
 
 MAINTAINER Edu Herraiz <ghark@gmail.com>
 
+ARG DOCKERHOST=172.17.0.1
+ENV DOCKERHOST ${DOCKERHOST}
 COPY requirements.txt /usr/src/app/requirements.txt
 RUN pip install --trusted-host None --no-cache-dir --use-wheel \
-   --extra-index-url http://172.17.0.1:9009/simple/ \
-   --trusted-host 172.17.0.1 \
+   --extra-index-url http://${DOCKERHOST}:9009/simple/ \
+   --trusted-host ${DOCKERHOST} \
    -r /usr/src/app/requirements.txt
 
 ADD conf/circus.ini.tpl /etc/

diff --git a/thumbor/Dockerfile b/thumbor/Dockerfile
@@ -18,10 +18,12 @@ ENV SHELL bash
 ENV WORKON_HOME /usr/src/app
 WORKDIR /usr/src/app
 
+ARG DOCKERHOST=172.17.0.1
+ENV DOCKERHOST ${DOCKERHOST}
 COPY requirements.txt /usr/src/app/requirements.txt
 RUN pip install --trusted-host None --no-cache-dir --use-wheel \
-   --extra-index-url http://172.17.0.1:9009/simple/ \
-   --trusted-host 172.17.0.1 \
+   --extra-index-url http://${DOCKERHOST}:9009/simple/ \
+   --trusted-host ${DOCKERHOST} \
    -r /usr/src/app/requirements.txt
 
 COPY conf/thumbor.conf.tpl /usr/src/app/thumbor.conf.tpl