From 9b17533cccb4224246b98986216d9b628f66bb46 Mon Sep 17 00:00:00 2001
From: Adam Hunter <ahunter@ccg.murdoch.edu.au>
Date: Tue, 21 Jun 2016 17:09:42 +0800
Subject: [PATCH] Update for later docker

---
 build.sh                 | 21 ++++++++-------------
 docker-compose-build.yml |  9 ---------
 docker-compose.yml       | 25 ++++++++++++++++---------
 vars.env                 |  2 --
 4 files changed, 24 insertions(+), 33 deletions(-)
 delete mode 100644 docker-compose-build.yml
 delete mode 100644 vars.env

diff --git a/build.sh b/build.sh
index 68f8323..e3d91ad 100755
--- a/build.sh
+++ b/build.sh
@@ -9,19 +9,14 @@ set -x
 set -a
 
 DATE=`date +%Y.%m.%d`
-COMPOSE='docker-compose -f docker-compose-build.yml run docker19'
+DOCKER_DEVPI_VERSION=4.0.0
 
-. ./vars.env
+docker-compose build devpi
+docker inspect muccg/devpi:latest
 
-## warm up cache for CI
-docker pull ${IMAGE} || true
+docker tag muccg/devpi:latest muccg/devpi:latest-${DATE}
+docker tag muccg/devpi:latest muccg/devpi:${DOCKER_DEVPI_VERSION}
 
-${COMPOSE} build --pull=true --build-arg ARG_DEVPI_VERSION=${DEVPI_VERSION} -t ${IMAGE}:latest /data
-${COMPOSE} inspect ${IMAGE}:latest
-
-${COMPOSE} tag -f ${IMAGE}:latest ${IMAGE}:latest-${DATE}
-${COMPOSE} tag -f ${IMAGE}:latest ${IMAGE}:${DEVPI_VERSION}
-
-${COMPOSE} push ${IMAGE}:latest
-${COMPOSE} push ${IMAGE}:latest-${DATE}
-${COMPOSE} push ${IMAGE}:${DEVPI_VERSION}
+docker push muccg/devpi:latest
+docker push muccg/devpi:latest-${DATE}
+docker push muccg/devpi:${DOCKER_DEVPI_VERSION}
diff --git a/docker-compose-build.yml b/docker-compose-build.yml
deleted file mode 100644
index 5f15bad..0000000
--- a/docker-compose-build.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-# docker socket shared with the host
-# docker creds shared with the host
-docker19:
-  image: docker:1.9.1
-  env_file: vars.env
-  volumes:
-    - /var/run/docker.sock:/var/run/docker.sock
-    - ~/.docker/config.json:/root/.docker/config.json
-    - ./:/data
diff --git a/docker-compose.yml b/docker-compose.yml
index bcde2c2..7f3bc62 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,9 +1,16 @@
-devpi:
-  image: muccg/docker-devpi
-  volumes:
-    - /srv/docker/devpi:/data
-  ports:
-    - 3141:3141
-  environment:
-    - DEVPI_PASSWORD=
-  restart: always
+version: '2'
+services:
+
+  devpi:
+    build:
+      context: ./
+      args:
+        ARG_DEVPI_VERSION: ${DOCKER_DEVPI_VERSION}
+    image: muccg/devpi
+    volumes:
+      - ./data:/data
+    ports:
+      - 3142:3141
+    environment:
+      - DEVPI_PASSWORD=
+    restart: always
diff --git a/vars.env b/vars.env
deleted file mode 100644
index 653ee52..0000000
--- a/vars.env
+++ /dev/null
@@ -1,2 +0,0 @@
-DEVPI_VERSION=4.0.0
-IMAGE=muccg/devpi