From 90792b4d6f22705ac1ddb1f1ab0e7fdab52e4546 Mon Sep 17 00:00:00 2001
From: Brendan Beveridge <brendan@nodeintegration.com.au>
Date: Tue, 12 Feb 2019 14:29:29 +1100
Subject: [PATCH 1/4] testing pr ci/cd

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 263221f..6039fbb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,7 @@ FROM golang:alpine AS shfmt
 LABEL name="shfmt"
 LABEL version="2.5.1"
 
+
 ENV GOOS linux
 ENV CGO_ENABLED 0
 ENV SHFMT_VERSION 2.5.1

From 1e1779fe42a236f0936024048a5b65c3782550fe Mon Sep 17 00:00:00 2001
From: Brendan Beveridge <brendan@nodeintegration.com.au>
Date: Wed, 13 Feb 2019 07:40:27 +1100
Subject: [PATCH 2/4] testing steps

---
 .drone.yml | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index a577542..592c190 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2,14 +2,26 @@
 pipeline: default
 name: default
 steps:
-- name: docker build
-  image: plugins/docker
+- name: build
+  image: docker
+  command:
+    - docker build -t nodeintegration/bevenv:${DRONE_BRANCH}-${DRONE_BUILD_NUMBER}
+  volumes:
+    - /var/run/docker.sock:/var/run/docker.sock
   settings:
     username:
       from_secret: dockerhub_username
     password:
       from_secret: dockerhub_password
-    repo: nodeintegration/bevenv
-    tags:
-      - 1.0.1
-    dry_run: true
+- name: test
+  image: docker
+  command:
+    - docker run -t nodeintegration/bevenv:${DRONE_BRANCH}-${DRONE_BUILD_NUMBER} echo "yay"
+  volumes:
+    - /var/run/docker.sock:/var/run/docker.sock
+  settings:
+    username:
+      from_secret: dockerhub_username
+    password:
+      from_secret: dockerhub_password
+

From 30474a61ab6eab5a054b3135c3bd9f920b4aa689 Mon Sep 17 00:00:00 2001
From: Brendan Beveridge <brendan@nodeintegration.com.au>
Date: Wed, 13 Feb 2019 11:07:42 +1100
Subject: [PATCH 3/4] change drone yml to use bind mounts instead of plugin

---
 .drone.yml | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 592c190..96193e9 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,10 +4,11 @@ name: default
 steps:
 - name: build
   image: docker
-  command:
-    - docker build -t nodeintegration/bevenv:${DRONE_BRANCH}-${DRONE_BUILD_NUMBER}
+  commands:
+  - docker build -t nodeintegration/bevenv:${DRONE_BRANCH}-${DRONE_BUILD_NUMBER} ./
   volumes:
-    - /var/run/docker.sock:/var/run/docker.sock
+  - name: docker
+    path: /var/run/docker.sock
   settings:
     username:
       from_secret: dockerhub_username
@@ -15,13 +16,19 @@ steps:
       from_secret: dockerhub_password
 - name: test
   image: docker
-  command:
-    - docker run -t nodeintegration/bevenv:${DRONE_BRANCH}-${DRONE_BUILD_NUMBER} echo "yay"
+  commands:
+  - docker ps
+  - docker images | grep nodeintegration | grep bevenv
+  - docker run nodeintegration/bevenv:${DRONE_BRANCH}-${DRONE_BUILD_NUMBER} echo "yay"
   volumes:
-    - /var/run/docker.sock:/var/run/docker.sock
+  - name: docker
+    path: /var/run/docker.sock
   settings:
     username:
       from_secret: dockerhub_username
     password:
       from_secret: dockerhub_password
-
+volumes:
+- name: docker
+  host:
+    path: /var/run/docker.sock

From 21ea6a7fdff1ab58d5361078389b61384ea8808a Mon Sep 17 00:00:00 2001
From: Brendan Beveridge <brendan@nodeintegration.com.au>
Date: Wed, 13 Feb 2019 11:13:33 +1100
Subject: [PATCH 4/4] change drone yml to use bind mounts instead of plugin

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 6039fbb..a27acf4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -110,3 +110,4 @@ COPY --chown=dlt:dlt config/entrypoint.sh /
 ENTRYPOINT [ "/entrypoint.sh" ]
 WORKDIR ${HOME}/workspace
 
+