From 1967ccebda5ac27d2c1caa7a34bbf7e24ad4395b Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Mon, 11 Jul 2016 02:01:44 +1000
Subject: [PATCH] Updated with new .gitlab-ci file

---
 .gitlab-ci.yml | 25 ++++++++++++++-----------
 Dockerfile     |  1 -
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2365e9..c7262b9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,26 +1,29 @@
-image: leenooks/ci-docker:latest
+image: docker:latest
 
 stages:
 - test
 - build
 
-services:
-- leenooks/ci-docker:dind
-
 variables:
   VERSION: "7"
+  DOCKER_IMAGE: leenooks/base
+  DOCKER_REGISTRY: registry.leenooks.net
+  DOCKER_HOST: tcp://${DOCKER_REGISTRY}-leenooks-ci-docker:2375
+
+services:
+- ${DOCKER_REGISTRY}/leenooks/ci-docker:dind
 
 before_script:
-- test -n "${REGISTRY}" # Needs to be set in project
-- test -n "${IMAGE}"    # Needs to be set in project
 - docker info
 - docker version
-- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN ${REGISTRY}
+- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN ${DOCKER_REGISTRY}
 
 test:
   stage: test
   script:
-  - docker build -t ${IMAGE}:${VERSION} .
+  - cat /etc/hosts
+  - env|sort
+  - docker build -t ${DOCKER_IMAGE}:${VERSION} .
   - docker images
   only:
   - debug
@@ -28,9 +31,9 @@ test:
 build:
   stage: build
   script:
-  - docker build -t ${IMAGE}:${VERSION} .
-  - docker tag ${IMAGE}:${VERSION} ${REGISTRY}/${IMAGE}:${VERSION}
-  - docker push ${REGISTRY}/${IMAGE}:${VERSION}
+  - docker build -t ${DOCKER_IMAGE}:${VERSION} .
+  - docker tag ${DOCKER_IMAGE}:${VERSION} ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${VERSION}
+  - docker push ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${VERSION}
   tags:
   - docker
   only:
diff --git a/Dockerfile b/Dockerfile
index 7175873..3aee94e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,5 @@
 # NAME leenooks/base
 # VERSION 7
-# BUILD docker build -t="leenooks/base" .
 
 FROM centos:7
 MAINTAINER deon@leenooks.net