From be530d88e89c996c656b38b1e234356984c617dc Mon Sep 17 00:00:00 2001
From: itsdalmo <kristian@doingit.no>
Date: Fri, 9 Nov 2018 15:17:54 +0100
Subject: [PATCH] Add --no-cache flag to apk installs

---
 golang/1.10/Dockerfile       | 6 ++----
 golang/1.11/Dockerfile       | 6 ++----
 python/Dockerfile            | 5 ++---
 terraform/0.11.10/Dockerfile | 6 ++----
 terraform/0.11.6/Dockerfile  | 6 ++----
 terraform/0.11.7/Dockerfile  | 6 ++----
 terraform/0.11.8/Dockerfile  | 6 ++----
 terraform/0.11.9/Dockerfile  | 6 ++----
 8 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/golang/1.10/Dockerfile b/golang/1.10/Dockerfile
index eedefc5..e7ab5e9 100644
--- a/golang/1.10/Dockerfile
+++ b/golang/1.10/Dockerfile
@@ -1,10 +1,8 @@
 FROM golang:1.10-alpine as resource
-RUN apk add --update \
+RUN apk add --update --no-cache \
     make \
     bash \
-    git \
-    && rm -rf /var/cache/apk/*
-
+    git
 FROM resource
 ENTRYPOINT [ "go" ]
 CMD [ "help" ]
diff --git a/golang/1.11/Dockerfile b/golang/1.11/Dockerfile
index 34ef57c..8abd86d 100644
--- a/golang/1.11/Dockerfile
+++ b/golang/1.11/Dockerfile
@@ -1,10 +1,8 @@
 FROM golang:1.11-alpine as resource
-RUN apk add --update \
+RUN apk add --update --no-cache \
     make \
     bash \
-    git \
-    && rm -rf /var/cache/apk/*
-
+    git
 FROM resource
 ENTRYPOINT [ "go" ]
 CMD [ "help" ]
diff --git a/python/Dockerfile b/python/Dockerfile
index 1c4c13a..71058ad 100644
--- a/python/Dockerfile
+++ b/python/Dockerfile
@@ -1,9 +1,8 @@
 FROM python:3.7-alpine as resource
-RUN apk add --update \
+RUN apk add --update --no-cache \
     git \
     zip \
-    unzip \
-    && rm -rf /var/cache/apk/*
+    unzip
 RUN pip install \
     pyyaml \
     docopt \
diff --git a/terraform/0.11.10/Dockerfile b/terraform/0.11.10/Dockerfile
index 39f7683..6f4cc68 100644
--- a/terraform/0.11.10/Dockerfile
+++ b/terraform/0.11.10/Dockerfile
@@ -1,8 +1,6 @@
 FROM hashicorp/terraform:0.11.10 as resource
-RUN apk add --update \
-    make \
-    && rm -rf /var/cache/apk/*
-
+RUN apk add --update --no-cache \
+    make
 FROM resource
 ENTRYPOINT [ "terraform" ]
 CMD [ "--help" ]
diff --git a/terraform/0.11.6/Dockerfile b/terraform/0.11.6/Dockerfile
index 87ed55b..26708f8 100644
--- a/terraform/0.11.6/Dockerfile
+++ b/terraform/0.11.6/Dockerfile
@@ -1,8 +1,6 @@
 FROM hashicorp/terraform:0.11.6 as resource
-RUN apk add --update \
-    make \
-    && rm -rf /var/cache/apk/*
-
+RUN apk add --update --no-cache \
+    make
 FROM resource
 ENTRYPOINT [ "terraform" ]
 CMD [ "--help" ]
diff --git a/terraform/0.11.7/Dockerfile b/terraform/0.11.7/Dockerfile
index 9bfedc4..c6e6110 100644
--- a/terraform/0.11.7/Dockerfile
+++ b/terraform/0.11.7/Dockerfile
@@ -1,8 +1,6 @@
 FROM hashicorp/terraform:0.11.7 as resource
-RUN apk add --update \
-    make \
-    && rm -rf /var/cache/apk/*
-
+RUN apk add --update --no-cache \
+    make
 FROM resource
 ENTRYPOINT [ "terraform" ]
 CMD [ "--help" ]
diff --git a/terraform/0.11.8/Dockerfile b/terraform/0.11.8/Dockerfile
index 39341ef..bfd3aba 100644
--- a/terraform/0.11.8/Dockerfile
+++ b/terraform/0.11.8/Dockerfile
@@ -1,8 +1,6 @@
 FROM hashicorp/terraform:0.11.8 as resource
-RUN apk add --update \
-    make \
-    && rm -rf /var/cache/apk/*
-
+RUN apk add --update --no-cache \
+    make
 FROM resource
 ENTRYPOINT [ "terraform" ]
 CMD [ "--help" ]
diff --git a/terraform/0.11.9/Dockerfile b/terraform/0.11.9/Dockerfile
index 4fe76ec..6ec2414 100644
--- a/terraform/0.11.9/Dockerfile
+++ b/terraform/0.11.9/Dockerfile
@@ -1,8 +1,6 @@
 FROM hashicorp/terraform:0.11.9 as resource
-RUN apk add --update \
-    make \
-    && rm -rf /var/cache/apk/*
-
+RUN apk add --update --no-cache \
+    make
 FROM resource
 ENTRYPOINT [ "terraform" ]
 CMD [ "--help" ]