openstack/swift
Code Issues Proposed changes

Fix docker image building

Browse Source 
Change-Id: I47aafc2d02f8e3ab2a027d978d40677dbefece96
This commit is contained in:
Tim Burke 2022-08-16 12:17:01 -07:00
parent d8af3d7a0d
commit 9abee0e784
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -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

4
Dockerfile-py3
View File

@ -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

11
docker/install_scripts/20_apk_install_py2.sh
View File

@ -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

3
docker/install_scripts/99_apk_uninstall_dev.sh
View File

@ -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/*