diff options
| author | Tim Burke <tim.burke@gmail.com> | 2022-08-16 12:17:01 -0700 |
|---|---|---|
| committer | Tim Burke <tim.burke@gmail.com> | 2022-08-16 12:17:01 -0700 |
| commit | 9abee0e7845445c761e4b3aa8abce28281cf2bfa (patch) | |
| tree | 49ff27b4a6acc33389f276943ac947c0f510617b /docker | |
| parent | d8af3d7a0db2609fc1a0805a8d592ba4e2d9e120 (diff) | |
| download | swift-9abee0e7845445c761e4b3aa8abce28281cf2bfa.tar.gz | |
Fix docker image building
Change-Id: I47aafc2d02f8e3ab2a027d978d40677dbefece96
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/install_scripts/20_apk_install_py2.sh | 11 | ||||
| -rwxr-xr-x | docker/install_scripts/99_apk_uninstall_dev.sh | 3 |
2 files changed, 8 insertions, 6 deletions
diff --git a/docker/install_scripts/20_apk_install_py2.sh b/docker/install_scripts/20_apk_install_py2.sh index 32367cc8d..12c28e59c 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 5109354e9..3e478c9a4 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/* |