From c834d653c9a604085ed76138f58d9edd0035ed58 Mon Sep 17 00:00:00 2001
From: Emil Lerch <emil@lerch.org>
Date: Fri, 27 Nov 2020 17:23:54 -0800
Subject: [PATCH] switch to debian:buster slim and install make

---
 .drone.yml | 8 +++++++-
 Makefile   | 1 -
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 90190e2..5083add 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,7 +4,7 @@ name: default
 
 steps:
 - name: make
-  image: docker:dind
+  image: debian:buster-slim
   environment:
     USERNAME:
       from_secret: docker_username
@@ -12,11 +12,17 @@ steps:
       from_secret: docker_password
     REGISTRY:
       from_secret: docker_registry
+    DOCKERVERSION: "19.03.9"
   volumes:
   - name: dockersock
     path: /var/run
   commands:
+  - apt-get update && apt install -y --no-install-recommends curl make ca-certificates git
+  - curl -fsSLO https://download.docker.com/linux/static/stable/x86_64/docker-$${DOCKERVERSION}.tgz
+  - tar xzvf docker-$${DOCKERVERSION}.tgz --strip 1 -C /usr/local/bin docker/docker
+  - rm docker-$${DOCKERVERSION}.tgz
   - sleep 5 # give docker enough time to start
+  - echo login $REGISTRY
   - docker login -u $USERNAME -p $PASSWORD $REGISTRY
   - make manifest-list
 - name: notify
diff --git a/Makefile b/Makefile
index 49dee6d..731b4ac 100755
--- a/Makefile
+++ b/Makefile
@@ -137,7 +137,6 @@ go-build: $(BUILD_DIRS)
 	@mkdir -p "$$(pwd)/.go/bin/$(OS)_$(ARCH)"
 	@chmod $(BINDIRMODE) "$$(pwd)/.go/bin/$(OS)_$(ARCH)"
 	@docker run                                                 \
-	    -i                                                      \
 	    --rm                                                    \
 	    -u $$(id -u):$$(id -g)                                  \
 	    -v $$(pwd):/src                                         \