From f6ccd9a3bd56ac6cfc2060095b1877dd25883569 Mon Sep 17 00:00:00 2001
From: Ian Fijolek <ian@iamthefij.com>
Date: Fri, 22 Nov 2019 14:44:21 -0800
Subject: [PATCH] Update Dockerfiles to newer (roughly) pinned versions

---
 Dockerfile             | 5 +++--
 Dockerfile.multi-stage | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a3ff139..38c12d8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
-FROM ${REPO}/alpine:latest
+ARG REPO=library
+FROM ${REPO}/alpine:3.10
 RUN mkdir /app
 WORKDIR /app/
 
@@ -7,7 +8,7 @@ ARG ARCH=amd64
 COPY ./minitor-go ./minitor
 
 # Add common checking tools
-RUN apk --no-cache add bash==4.4.19-r1 curl==7.64.0-r3 jq==1.6-r0
+RUN apk --no-cache add bash=~5.0 curl=~7.66 jq=~1.6
 
 # Add minitor user for running as non-root
 RUN addgroup -S minitor && adduser -S minitor -G minitor
diff --git a/Dockerfile.multi-stage b/Dockerfile.multi-stage
index 57a09c4..5141762 100644
--- a/Dockerfile.multi-stage
+++ b/Dockerfile.multi-stage
@@ -1,7 +1,7 @@
 ARG REPO=library
 FROM golang:1.12-alpine AS builder
 
-RUN apk add --no-cache git
+RUN apk add --no-cache git=~2
 
 RUN mkdir /app
 WORKDIR /app
@@ -16,7 +16,7 @@ ARG VERSION=dev
 ENV CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH}
 RUN go build -ldflags "-X main.version=${VERSION}" -a -installsuffix nocgo -o minitor .
 
-FROM ${REPO}/alpine:latest
+FROM ${REPO}/alpine:3.10
 RUN mkdir /app
 WORKDIR /app/
 
@@ -24,7 +24,7 @@ WORKDIR /app/
 COPY --from=builder /app/minitor .
 
 # Add common checking tools
-RUN apk --no-cache add bash==4.4.19-r1 curl==7.64.0-r3 jq==1.6-r0
+RUN apk --no-cache add bash=~5.0 curl=~7.66 jq=~1.6
 
 # Add minitor user for running as non-root
 RUN addgroup -S minitor && adduser -S minitor -G minitor