From 69099bb5aaf943a3a4ea11d14f059c6cac34b2c4 Mon Sep 17 00:00:00 2001
From: Scott Leggett <scott@sl.id.au>
Date: Wed, 5 Aug 2020 21:42:04 +0800
Subject: [PATCH 1/2] Bump docker image versions

* alpine 3.12
* python 3
* yamale 3.0.2
* yamllint 1.24.2

Signed-off-by: Scott Leggett <scott@sl.id.au>
---
 Dockerfile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 339c6f51..85d6ed25 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,22 +1,22 @@
-FROM alpine:3.11
+FROM alpine:3.12
 
 RUN apk --no-cache add \
     curl \
     git \
     libc6-compat \
     openssh-client \
-    python \
-    py-crcmod \
-    py-pip && \
-    pip install --upgrade pip==18.1
+    py3-pip \
+    py3-wheel \
+    python3 \
+    && pip install --upgrade pip==20.2.1
 
 # Install a YAML Linter
-ARG yamllint_version=1.21.0
+ARG yamllint_version=1.24.2
 LABEL yamllint_version=$yamllint_version
 RUN pip install "yamllint==$yamllint_version"
 
 # Install Yamale YAML schema validator
-ARG yamale_version=2.0.1
+ARG yamale_version=3.0.2
 LABEL yamale_version=$yamale_version
 RUN pip install "yamale==$yamale_version"
 

From 570ae6337668ed4f15de64ab8d0d63fdb4befee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reinhard=20N=C3=A4gele?= <unguiculus@gmail.com>
Date: Sun, 9 Aug 2020 23:12:13 +0200
Subject: [PATCH 2/2] Update Dockerfile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Reinhard Nägele <unguiculus@gmail.com>
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 85d6ed25..585f5023 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,8 +7,8 @@ RUN apk --no-cache add \
     openssh-client \
     py3-pip \
     py3-wheel \
-    python3 \
-    && pip install --upgrade pip==20.2.1
+    python3 && \
+    pip install --upgrade pip==20.2.1
 
 # Install a YAML Linter
 ARG yamllint_version=1.24.2