From 037e12363e9b95f34014d37ee8dfe28fc726b122 Mon Sep 17 00:00:00 2001 From: Johann Fuechsl Date: Tue, 3 Dec 2019 08:02:37 +0100 Subject: [PATCH 1/2] Upgrade registry and boto versions --- rootfs/Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile index 49b774a..a6f0650 100644 --- a/rootfs/Dockerfile +++ b/rootfs/Dockerfile @@ -1,20 +1,20 @@ -FROM registry:2.6.0 +FROM registry:2.7.1 RUN apk add --no-cache \ - python3 && \ + python3 && \ python3 -m ensurepip && \ ln -sf /usr/bin/python3 /usr/bin/python && \ ln -sf /usr/bin/pip3 /usr/bin/pip RUN buildDeps='gcc git linux-headers musl-dev python3-dev' && \ apk add --no-cache $buildDeps && \ - # "upgrade" boto to 2.43.0 + the patch to fix minio connections + # "upgrade" boto to 2.49.0: to support the latest AWS regions pip install --disable-pip-version-check --no-cache-dir --upgrade \ - git+https://github.com/teamhephy/boto@abb38474ee5124bb571da0c42be67cd27c47094f \ - azure==1.0.3 \ - gcloud==0.18.3 \ - python-swiftclient==3.1.0 \ - python-keystoneclient==3.1.0 && \ + boto==2.49.0 \ + azure==1.0.3 \ + gcloud==0.18.3 \ + python-swiftclient==3.8.1 \ + python-keystoneclient==3.1.0 && \ # purge dev dependencies apk del $buildDeps From bfbd79491f99293cd8b641b4672636be1e24b287 Mon Sep 17 00:00:00 2001 From: Johann Fuechsl Date: Fri, 19 Jun 2020 11:55:59 +0000 Subject: [PATCH 2/2] Dockerfile formatting --- rootfs/Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile index a6f0650..a799fde 100644 --- a/rootfs/Dockerfile +++ b/rootfs/Dockerfile @@ -1,20 +1,20 @@ FROM registry:2.7.1 RUN apk add --no-cache \ - python3 && \ + python3 && \ python3 -m ensurepip && \ ln -sf /usr/bin/python3 /usr/bin/python && \ ln -sf /usr/bin/pip3 /usr/bin/pip RUN buildDeps='gcc git linux-headers musl-dev python3-dev' && \ apk add --no-cache $buildDeps && \ - # "upgrade" boto to 2.49.0: to support the latest AWS regions + # "upgrade" boto to 2.49.0 to support the latest AWS regions pip install --disable-pip-version-check --no-cache-dir --upgrade \ - boto==2.49.0 \ - azure==1.0.3 \ - gcloud==0.18.3 \ - python-swiftclient==3.8.1 \ - python-keystoneclient==3.1.0 && \ + boto==2.49.0 \ + azure==1.0.3 \ + gcloud==0.18.3 \ + python-swiftclient==3.8.1 \ + python-keystoneclient==3.1.0 && \ # purge dev dependencies apk del $buildDeps