.drone.yml

@@ -12,11 +12,14 @@ steps:
       from_secret: docker_password
     REGISTRY:
       from_secret: docker_registry
+    DOCKER_CLI_LOCATION:
+      from_secret: docker-cli-location
   volumes:
   - name: dockersock
     path: /var/run
   commands:
   - apk add make git
+  - 'export PATH="$${DOCKER_CLI_LOCATION}":"$${PATH}"'
   - 'while [ "$(docker info >/dev/null 2>&1; echo $?)" -ne 0 ]; do sleep 1; done'
   - echo login $REGISTRY
   - docker login -u $USERNAME -p $PASSWORD $REGISTRY

Makefile

@@ -127,7 +127,7 @@ STAMPS = $(foreach outbin,$(OUTBINS),.go/$(outbin).stamp)
 $(STAMPS): go-build
 	@echo "binary: $(OUTBIN)"
 	@if ! cmp -s .go/$(OUTBIN) $(OUTBIN); then  \
-	    mv -f .go/$(OUTBIN) $(OUTBIN);          \
+	    mv .go/$(OUTBIN) $(OUTBIN);             \
 	    date >$@;                               \
 	fi
 
@@ -254,7 +254,7 @@ test: $(BUILD_DIRS)
 	@$(DKR) run                                                 \
 	    -i                                                      \
 	    --rm                                                    \
-	    -u $(UID):$(GID)                                        \
+	    -u $$(id -u):$$(id -g)                                  \
 	    -v $$(pwd):/src                                         \
 	    -w /src                                                 \
 	    -v $$(pwd)/.go/bin/$(OS)_$(ARCH):/go/bin                \