From 6f6572bb8a786e33da4fada6c14ddd65e70426bb Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 12 Jul 2019 18:53:34 +0200
Subject: [PATCH] Update to python 3.7 (buster) and use build-args

The build arg can be used to either test different versions, but
also makes it easier to "grep" when upgrading versions.

The output format of `gpg2 --list-secret-keys` changed in the version
installed on Buster, so `grep` was replaced with `awk` to address
the new output format;

Debian Jessie:

    gpg2 --no-auto-check-trustdb --list-secret-keys
    /root/.gnupg/secring.gpg
    ------------------------
    sec   1024D/A7B21401 2018-04-25
    uid                  Sakuya Izayoi <sakuya@gensokyo.jp>
    ssb   1024g/C235E4CE 2018-04-25

Debian Buster:

    gpg2 --no-auto-check-trustdb --list-secret-keys
    /root/.gnupg/pubring.kbx
    ------------------------
    sec   dsa1024 2018-04-25 [SCA]
          9781B87DAB042E6FD51388A5464ED987A7B21401
    uid           [ultimate] Sakuya Izayoi <sakuya@gensokyo.jp>
    ssb   elg1024 2018-04-25 [E]

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 Dockerfile                  | 4 +++-
 Dockerfile-docs             | 4 +++-
 Dockerfile-py3              | 4 +++-
 tests/Dockerfile            | 7 ++++---
 tests/Dockerfile-dind-certs | 4 +++-
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 82758daf9..124f68cdd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,6 @@
-FROM python:2.7
+ARG PYTHON_VERSION=2.7
+
+FROM python:${PYTHON_VERSION}
 
 RUN mkdir /src
 WORKDIR /src
diff --git a/Dockerfile-docs b/Dockerfile-docs
index 105083e8c..9d11312fc 100644
--- a/Dockerfile-docs
+++ b/Dockerfile-docs
@@ -1,4 +1,6 @@
-FROM python:3.5
+ARG PYTHON_VERSION=3.7
+
+FROM python:${PYTHON_VERSION}
 
 ARG uid=1000
 ARG gid=1000
diff --git a/Dockerfile-py3 b/Dockerfile-py3
index d558ba3e4..22732dec5 100644
--- a/Dockerfile-py3
+++ b/Dockerfile-py3
@@ -1,4 +1,6 @@
-FROM python:3.6
+ARG PYTHON_VERSION=3.7
+
+FROM python:${PYTHON_VERSION}
 
 RUN mkdir /src
 WORKDIR /src
diff --git a/tests/Dockerfile b/tests/Dockerfile
index 8f49cd2ce..f2f36b447 100644
--- a/tests/Dockerfile
+++ b/tests/Dockerfile
@@ -1,5 +1,6 @@
-ARG PYTHON_VERSION=3.6
-FROM python:$PYTHON_VERSION-jessie
+ARG PYTHON_VERSION=3.7
+
+FROM python:${PYTHON_VERSION}
 RUN apt-get update && apt-get -y install \
     gnupg2 \
     pass \
@@ -8,7 +9,7 @@ RUN apt-get update && apt-get -y install \
 COPY ./tests/gpg-keys /gpg-keys
 RUN gpg2 --import gpg-keys/secret
 RUN gpg2 --import-ownertrust gpg-keys/ownertrust
-RUN yes | pass init $(gpg2 --no-auto-check-trustdb --list-secret-keys | grep ^sec | cut -d/ -f2 | cut -d" " -f1)
+RUN yes | pass init $(gpg2 --no-auto-check-trustdb --list-secret-key | awk '/^sec/{getline; $1=$1; print}')
 RUN gpg2 --check-trustdb
 ARG CREDSTORE_VERSION=v0.6.2
 RUN curl -sSL -o /opt/docker-credential-pass.tar.gz \
diff --git a/tests/Dockerfile-dind-certs b/tests/Dockerfile-dind-certs
index 9e8c042b6..2ab87ef73 100644
--- a/tests/Dockerfile-dind-certs
+++ b/tests/Dockerfile-dind-certs
@@ -1,4 +1,6 @@
-FROM python:2.7
+ARG PYTHON_VERSION=2.7
+
+FROM python:${PYTHON_VERSION}
 RUN mkdir /tmp/certs
 VOLUME /certs