docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Sebastiaan van Stijn 2019-07-12 18:53:34 +02:00 committed by Christopher Crone
parent 546bc63244
commit ea4fbd7ddf
5 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -1,4 +1,6 @@
FROM python:2.7 ARG PYTHON_VERSION=2.7
FROM python:${PYTHON_VERSION}
RUN mkdir /src RUN mkdir /src
WORKDIR /src WORKDIR /src

4
Dockerfile-docs
View File

@ -1,4 +1,6 @@
FROM python:3.5 ARG PYTHON_VERSION=3.7
FROM python:${PYTHON_VERSION}
ARG uid=1000 ARG uid=1000
ARG gid=1000 ARG gid=1000

4
Dockerfile-py3
View File

@ -1,4 +1,6 @@
FROM python:3.6 ARG PYTHON_VERSION=3.7
FROM python:${PYTHON_VERSION}
RUN mkdir /src RUN mkdir /src
WORKDIR /src WORKDIR /src

7
tests/Dockerfile
View File

@ -1,5 +1,6 @@
ARG PYTHON_VERSION=3.6 ARG PYTHON_VERSION=3.7
FROM python:$PYTHON_VERSION-jessie
FROM python:${PYTHON_VERSION}
RUN apt-get update && apt-get -y install \ RUN apt-get update && apt-get -y install \
gnupg2 \ gnupg2 \
pass \ pass \
@ -8,7 +9,7 @@ RUN apt-get update && apt-get -y install \
COPY ./tests/gpg-keys /gpg-keys COPY ./tests/gpg-keys /gpg-keys
RUN gpg2 --import gpg-keys/secret RUN gpg2 --import gpg-keys/secret
RUN gpg2 --import-ownertrust gpg-keys/ownertrust 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 RUN gpg2 --check-trustdb
ARG CREDSTORE_VERSION=v0.6.2 ARG CREDSTORE_VERSION=v0.6.2
RUN curl -sSL -o /opt/docker-credential-pass.tar.gz \ RUN curl -sSL -o /opt/docker-credential-pass.tar.gz \

4
tests/Dockerfile-dind-certs
View File

@ -1,4 +1,6 @@
FROM python:2.7 ARG PYTHON_VERSION=2.7
FROM python:${PYTHON_VERSION}
RUN mkdir /tmp/certs RUN mkdir /tmp/certs
VOLUME /certs VOLUME /certs