Improve CI process

Dockerfile

@@ -1,4 +1,4 @@
-FROM clojure:lein-2.8.1 AS build
+FROM clojure:lein-2.8.1 AS base
 
 RUN echo 'deb http://archive.debian.org/debian stretch main\n\
           deb http://archive.debian.org/debian-security stretch/updates main' > /etc/apt/sources.list
@@ -15,6 +15,8 @@ RUN apt update && \
 
 WORKDIR /app
 
+FROM base as build
+
 COPY . /app
 
 RUN cd client && npm install && npm run release
@@ -27,13 +29,10 @@ RUN echo 'deb http://archive.debian.org/debian stretch main\n\
           deb http://archive.debian.org/debian-security stretch/updates main' > /etc/apt/sources.list
 
 # Install package dependencies and add precompiled binary
-RUN for i in {1..5}; do \
-       (apt-get update \
-        && apt-get -y install postgresql-client gdal-bin python-gdal libgdal-java \
-        && break) \
-       || (sleep 5; false); done \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && \
+    apt-get -y install postgresql-client gdal-bin python-gdal libgdal-java && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
 
 # Add scripts
 COPY --from=build /app/scripts/ /app/scripts/

build.sh

@@ -13,6 +13,6 @@ if [[ -z "$DOCKER_TAG" ]]; then
 fi
 
 dockerBuildAndPush
-dockerBuildAndPush -d mapserver -s "-mapserver" -t "-mapserver" -o "-f mapserver/Dockerfile.mapserver"
-dockerBuildAndPush -d mapserver -s "-mapserver" -t "-mapcache" -o "-f mapserver/Dockerfile.mapcache"
+dockerBuildAndPush -d mapserver -s "-mapserver" -o "-f mapserver/Dockerfile.mapserver"
+dockerBuildAndPush -d mapserver -s "-mapcache" -o "-f mapserver/Dockerfile.mapcache"
 dockerBuildAndPush -d scripts -s "-tools"

docker-cloud.sample.yml

@@ -21,12 +21,12 @@ web:
     - mapserver-data
 
 mapcache:
-  image: instedd/planwise-mapserver:kenya-mapcache
+  image: instedd/planwise-mapcache:kenya
   autorestart: always
   autoredeploy: true
 
 mapserver:
-  image: instedd/planwise-mapserver:kenya-mapserver
+  image: instedd/planwise-mapserver:kenya
   autorestart: always
   autoredeploy: true
   volumes_from:

docker-compose.production.yml

@@ -34,12 +34,12 @@ services:
 
   mapcache:
     container_name: planwise-prod-mapcache
-    image: instedd/planwise-mapserver:kenya-mapcache
+    image: instedd/planwise-mapcache:kenya
     pid: host
 
   mapserver:
     container_name: planwise-prod-mapserver
-    image: instedd/planwise-mapserver:kenya-mapserver
+    image: instedd/planwise-mapserver:kenya
     pid: host
     volumes:
       - data:/data

docker-compose.yml

@@ -3,8 +3,8 @@ version: '2'
 services:
   app:
     build:
-      dockerfile: Dockerfile-dev
       context: .
+      target: base
     platform: linux/amd64
     volumes:
       - ".:/app"
@@ -21,8 +21,8 @@ services:
 
   client:
     build:
-      dockerfile: Dockerfile-dev
       context: .
+      target: base
     platform: linux/amd64
     volumes:
       - ".:/app"

mapserver/docker-compose.yml

@@ -1,5 +1,5 @@
 mapcache:
-  image: instedd/planwise-mapserver:mapcache
+  image: instedd/planwise-mapcache
   # build: .
   # dockerfile: Dockerfile.mapcache
   volumes:
@@ -10,7 +10,7 @@ mapcache:
     - "5002:80"
 
 mapserver:
-  image: instedd/planwise-mapserver:mapserver
+  image: instedd/planwise-mapserver
   # build: .
   # dockerfile: Dockerfile.mapserver
   volumes: