From 4e7e2d89634ac7d67e55f1ef4bb18da3ebbbb6fe Mon Sep 17 00:00:00 2001
From: Sasha Gerrand <sgerrand@users.noreply.github.com>
Date: Fri, 31 Jan 2020 11:16:33 +0000
Subject: [PATCH 1/3] Remove extraneous command

The WORKDIR command which follows does the same thing.

https://docs.docker.com/engine/reference/builder/#workdir
---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 49e5d27..d8b7046 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,6 @@ FROM golang:1.13-alpine AS builder
 
 RUN apk add --no-cache git
 
-RUN mkdir -p /tmp/drone-terraform
 WORKDIR /tmp/drone-terraform
 
 COPY go.mod go.mod

From ed230eb71a8d64f4c3668a266014d42dc71bb8df Mon Sep 17 00:00:00 2001
From: Sasha Gerrand <sgerrand@users.noreply.github.com>
Date: Fri, 31 Jan 2020 11:18:36 +0000
Subject: [PATCH 2/3] Install packages without caching

Follows the method used earlier in the file for consistency and means that the apk cache directory doesn't need to be removed.
---
 Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d8b7046..1df108f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,12 +17,11 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -tags netgo -o /go/bin/dro
 
 FROM alpine:3.9
 
-RUN apk -U add \
+RUN apk add --no-cache \
     ca-certificates \
     git \
     wget \
-    openssh-client && \
-    rm -rf /var/cache/apk/*
+    openssh-client
 
 ARG terraform_version
 RUN wget -q https://releases.hashicorp.com/terraform/${terraform_version}/terraform_${terraform_version}_linux_amd64.zip -O terraform.zip && \

From 76b6fa2c767f6d435eb43f8ec4db35535cda55bf Mon Sep 17 00:00:00 2001
From: Sasha Gerrand <sgerrand@users.noreply.github.com>
Date: Fri, 31 Jan 2020 11:19:42 +0000
Subject: [PATCH 3/3] Use Alpine Linux 3.11

Alpine Linux 3.11 was released in December 2019.
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 1df108f..2b2dcae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@ COPY . .
 
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -tags netgo -o /go/bin/drone-terraform
 
-FROM alpine:3.9
+FROM alpine:3.11
 
 RUN apk add --no-cache \
     ca-certificates \