From b1311646c7a320e685200a077cf48460e88d2022 Mon Sep 17 00:00:00 2001
From: eater <=@eater.me>
Date: Wed, 28 Aug 2019 13:47:18 +0200
Subject: [PATCH] Use dind

---
 .drone.yml      | 16 ++++++++++++++++
 build-tagged.sh |  9 +++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 7efdda8..b6d575f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,10 +6,26 @@ steps:
 - name: build
   image: d.xr.to/eater/base
   privileged: true
+  volumes:
+  - 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
+
+volumes:
+- name: dockersock
+  temp: {}
diff --git a/build-tagged.sh b/build-tagged.sh
index 67feec8..28a93ea 100755
--- a/build-tagged.sh
+++ b/build-tagged.sh
@@ -4,12 +4,13 @@ set -e;
 DOCKER_EXEC="${DOCKER_EXEC:-docker}";
 IMAGE="${1:-d.xr.to/base}";
 MAINTAINER="${2:-=@eater.me}";
-
+DATEPREFIX="$(date +"%Y%m%d")"
 build_dir="$(dirname "$0")/build"
 test -d "${build_dir}" && rm -rf  "${build_dir}";
 
 for toolbox in "none" "toybox" "busybox" "default"; do
-    make IMAGE="${IMAGE}:${toolbox}" TOOLBOX="${toolbox}" DOCKER_EXEC="${DOCKER_EXEC}" all > "${toolbox}.log";
+    make IMAGE="${IMAGE}:${DATEPREFIX}-${toolbox}" TOOLBOX="${toolbox}" DOCKER_EXEC="${DOCKER_EXEC}" all > "${toolbox}.log";
+    $DOCKER_EXEC tag "${IMAGE}:${DATEPREFIX}-${toolbox}" "${toolbox}";
 done
-$DOCKER_EXEC tag "${IMAGE}:toybox" "${IMAGE}:latest";
-make IMAGE="${IMAGE}:glibc" TOOLBOX="toybox" ARCH="x86_64" DOCKER_EXEC="${DOCKER_EXEC}" all > "glibc.log";
+$DOCKER_EXEC tag "${IMAGE}:${DATEPREFIX}-toybox" "${IMAGE}:${DATEPREFIX}";
+make IMAGE="${IMAGE}:${DATEPREFIX}-glibc" TOOLBOX="toybox" ARCH="x86_64" DOCKER_EXEC="${DOCKER_EXEC}" all > "glibc.log";