From 9abee0e7845445c761e4b3aa8abce28281cf2bfa Mon Sep 17 00:00:00 2001 From: Tim Burke Date: Tue, 16 Aug 2022 12:17:01 -0700 Subject: [PATCH] Fix docker image building Change-Id: I47aafc2d02f8e3ab2a027d978d40677dbefece96 --- Dockerfile | 4 ++-- Dockerfile-py3 | 4 ++-- docker/install_scripts/20_apk_install_py2.sh | 11 ++++++----- docker/install_scripts/99_apk_uninstall_dev.sh | 3 ++- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3584802c4b..4eb1c8e2a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ ################################################ # -# Alpine 3.10.1 Swift-All-In-One +# Alpine 3.15.6 Swift-All-In-One # ################################################ -FROM alpine:3.10.1 +FROM alpine:3.15.6 MAINTAINER Openstack Swift ENV S6_LOGGING 1 diff --git a/Dockerfile-py3 b/Dockerfile-py3 index fd41853651..f4a652ba40 100644 --- a/Dockerfile-py3 +++ b/Dockerfile-py3 @@ -1,10 +1,10 @@ ################################################ # -# Alpine 3.10.1 Swift-All-In-One +# Alpine 3.16.2 Swift-All-In-One # ################################################ -FROM alpine:3.10.1 +FROM alpine:3.16.2 MAINTAINER Openstack Swift ENV S6_LOGGING 1 diff --git a/docker/install_scripts/20_apk_install_py2.sh b/docker/install_scripts/20_apk_install_py2.sh index 32367cc8de..12c28e59c4 100755 --- a/docker/install_scripts/20_apk_install_py2.sh +++ b/docker/install_scripts/20_apk_install_py2.sh @@ -2,8 +2,9 @@ set -e apk add --update \ - python \ - python-dev \ - py-pip \ - py-cffi \ - py-cryptography + python2 \ + python2-dev +wget -O - https://bootstrap.pypa.io/pip/2.7/get-pip.py | python +pip install \ + cffi \ + cryptography diff --git a/docker/install_scripts/99_apk_uninstall_dev.sh b/docker/install_scripts/99_apk_uninstall_dev.sh index 5109354e9b..3e478c9a40 100755 --- a/docker/install_scripts/99_apk_uninstall_dev.sh +++ b/docker/install_scripts/99_apk_uninstall_dev.sh @@ -13,5 +13,6 @@ apk del g++ apk del libffi-dev apk del libxslt-dev apk del libxml2-dev -apk del python-dev +apk del python2-dev || : +apk del python3-dev rm -rf /var/cache/apk/*