From a1ce0a56d5a70b41251c3f933db440154eb6fb1f Mon Sep 17 00:00:00 2001
From: eater <=@eater.me>
Date: Wed, 28 Aug 2019 16:55:32 +0200
Subject: [PATCH] Use -real- docker and upload logs after build

---
 .drone.yml      | 35 ++++++++++++++++++++++++++---------
 .gitignore      |  2 +-
 build-tagged.sh |  4 ++--
 logs/.gitignore |  0
 4 files changed, 29 insertions(+), 12 deletions(-)
 create mode 100644 logs/.gitignore

diff --git a/.drone.yml b/.drone.yml
index b6d575f..bb87406 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -10,22 +10,39 @@ steps:
   - name: dockersock
     path: /var/run
   commands:
-    - sleep 15 # wait for docker baby
     - docker login -u "drone" -p "$PASSWORD" d.xr.to
     - ./build-tagged.sh
     - docker push d.xr.to/base
   environment:
     PASSWORD:
       from_secret: pass
-
-services:
-- name: docker
-  image: docker:dind
-  privileged: true
   volumes:
-  - name: dockersock
-    path: /var/run
+  - name: docker
+    path: /var/run/docker.sock
+  - name: logs
+    path: /drone/src/logs
+- name: upload logs
+  image: minio/mc
+  commands:
+    - mc config host add minio https://io.cijber.net "$ACCESS_KEY" "$SECRET_KEY"
+    - mc cp logs/* "minio/logs/$DRONE_REPO/$DRONE_BUILD_NUMBER/"
+    - 'echo "Logs can be found at: https://io.cijber.net/minio/logs/$DRONE_REPO/$DRONE_BUILD_NUMBER/"'
+  environment:
+    ACCESS_KEY:
+      from_secret: minio_access_key
+    SECRET_KEY:
+      from_secret: minio_secret_key
+  volumes:
+  - name: logs
+    path: /drone/src/logs
+  when:
+    status:
+    - failure
+    - success
 
 volumes:
-- name: dockersock
+- name: logs
   temp: {}
+- name: docker
+  host:
+    path: /var/run/docker.sock
diff --git a/.gitignore b/.gitignore
index a312d93..124abc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-*.log
+logs/*.log
 build
diff --git a/build-tagged.sh b/build-tagged.sh
index 87f2771..c66b7ed 100755
--- a/build-tagged.sh
+++ b/build-tagged.sh
@@ -9,10 +9,10 @@ build_dir="$(dirname "$0")/build"
 test -d "${build_dir}" && rm -rf  "${build_dir}";
 
 for toolbox in "none" "toybox" "busybox" "default"; do
-    make IMAGE="${IMAGE}:${DATEPREFIX}-${toolbox}" TOOLBOX="${toolbox}" DOCKER_EXEC="${DOCKER_EXEC}" all > "${toolbox}.log";
+    make IMAGE="${IMAGE}:${DATEPREFIX}-${toolbox}" TOOLBOX="${toolbox}" DOCKER_EXEC="${DOCKER_EXEC}" all > "logs/${toolbox}.log";
     $DOCKER_EXEC tag "${IMAGE}:${DATEPREFIX}-${toolbox}" "${IMAGE}:${toolbox}";
 done
-make IMAGE="${IMAGE}:${DATEPREFIX}-glibc" TOOLBOX="toybox" ARCH="x86_64" DOCKER_EXEC="${DOCKER_EXEC}" all > "glibc.log";
+make IMAGE="${IMAGE}:${DATEPREFIX}-glibc" TOOLBOX="toybox" ARCH="x86_64" DOCKER_EXEC="${DOCKER_EXEC}" all > "logs/glibc.log";
 $DOCKER_EXEC tag "${IMAGE}:${DATEPREFIX}-glibc" "${IMAGE}:glibc";
 
 
diff --git a/logs/.gitignore b/logs/.gitignore
new file mode 100644
index 0000000..e69de29