Add --no-cache flag to apk installs

telia-oss · Nov 9, 2018 · be530d8 · be530d8
1 parent 1192450
commit be530d8
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 31 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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" ]