diff --git a/.zuul.yaml b/.zuul.yaml index 76442c24a5..17542b9de4 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -544,6 +544,9 @@ docker_images: - context: . repository: openstackswift/saio + tags: + - latest + - py3 - job: name: swift-upload-image @@ -567,41 +570,6 @@ pass-to-parent: true vars: *swift_image_vars -- job: - name: swift-build-image-py3 - parent: opendev-build-docker-image - voting: false - description: Build py3 SAIO docker images. - vars: &swift_image_vars_py3 - docker_images: - - context: . - dockerfile: Dockerfile-py3 - repository: openstackswift/saio - tags: - - py3 - -- job: - name: swift-upload-image-py3 - parent: opendev-upload-docker-image - voting: false - description: Build py3 SAIO docker images and upload to Docker Hub. - secrets: - name: docker_credentials - secret: swift-dockerhub - pass-to-parent: true - vars: *swift_image_vars_py3 - -- job: - name: swift-promote-image-py3 - parent: opendev-promote-docker-image - voting: false - description: Promote previously uploaded Docker images. - secrets: - name: docker_credentials - secret: swift-dockerhub - pass-to-parent: true - vars: *swift_image_vars_py3 - - job: name: swift-tox-func-py39-centos-9-stream-fips parent: swift-tox-func-py39-centos-9-stream diff --git a/Dockerfile b/Dockerfile index 4eb1c8e2a5..f4a652ba40 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ ################################################ # -# Alpine 3.15.6 Swift-All-In-One +# Alpine 3.16.2 Swift-All-In-One # ################################################ -FROM alpine:3.15.6 +FROM alpine:3.16.2 MAINTAINER Openstack Swift ENV S6_LOGGING 1 @@ -35,8 +35,8 @@ RUN mkdir /etc/swift && \ echo && \ echo && \ echo && \ - echo "================ starting apk_install_py2 ===================" && \ - /opt/swift/docker/install_scripts/20_apk_install_py2.sh && \ + echo "================ starting apk_install_py3 ===================" && \ + /opt/swift/docker/install_scripts/21_apk_install_py3.sh && \ echo && \ echo && \ echo && \ diff --git a/Dockerfile-py3 b/Dockerfile-py3 deleted file mode 100644 index f4a652ba40..0000000000 --- a/Dockerfile-py3 +++ /dev/null @@ -1,76 +0,0 @@ -################################################ -# -# Alpine 3.16.2 Swift-All-In-One -# -################################################ - -FROM alpine:3.16.2 -MAINTAINER Openstack Swift - -ENV S6_LOGGING 1 -ENV S6_VERSION 1.21.4.0 -ENV SOCKLOG_VERSION 3.0.1-1 -ENV ARCH amd64 -ENV BUILD_DIR "/tmp" -ENV ENV="/etc/profile" - -#COPY docker/install_scripts /install_scripts -COPY . /opt/swift - -ADD https://github.com/just-containers/s6-overlay/releases/download/v$S6_VERSION/s6-overlay-$ARCH.tar.gz /tmp/ -ADD https://github.com/just-containers/s6-overlay/releases/download/v$S6_VERSION/s6-overlay-$ARCH.tar.gz.sig /tmp/ -ADD https://github.com/just-containers/socklog-overlay/releases/download/v$SOCKLOG_VERSION/socklog-overlay-$ARCH.tar.gz /tmp/ - -RUN mkdir /etc/swift && \ - echo && \ - echo && \ - echo && \ - echo "================ starting swift_needs ===================" && \ - /opt/swift/docker/install_scripts/00_swift_needs.sh && \ - echo && \ - echo && \ - echo && \ - echo "================ starting apk_install_prereqs ===================" && \ - /opt/swift/docker/install_scripts/10_apk_install_prereqs.sh && \ - echo && \ - echo && \ - echo && \ - echo "================ starting apk_install_py3 ===================" && \ - /opt/swift/docker/install_scripts/21_apk_install_py3.sh && \ - echo && \ - echo && \ - echo && \ - echo "================ starting swift_install ===================" && \ - /opt/swift/docker/install_scripts/50_swift_install.sh && \ - echo && \ - echo && \ - echo && \ - echo "================ installing s6-overlay ===================" && \ - gpg --import /opt/swift/docker/s6-gpg-pub-key && \ - gpg --verify /tmp/s6-overlay-$ARCH.tar.gz.sig /tmp/s6-overlay-$ARCH.tar.gz && \ - gunzip -c /tmp/s6-overlay-$ARCH.tar.gz | tar -xf - -C / && \ - gunzip -c /tmp/socklog-overlay-amd64.tar.gz | tar -xf - -C / && \ - rm -rf /tmp/s6-overlay* && \ - rm -rf /tmp/socklog-overlay* && \ - echo && \ - echo && \ - echo && \ - echo "================ starting pip_uninstall_dev ===================" && \ - /opt/swift/docker/install_scripts/60_pip_uninstall_dev.sh && \ - echo && \ - echo && \ - echo && \ - echo "================ starting apk_uninstall_dev ===================" && \ - /opt/swift/docker/install_scripts/99_apk_uninstall_dev.sh && \ - echo && \ - echo && \ - echo && \ - echo "================ clean up ===================" && \ - echo "TODO: cleanup" - #rm -rf /opt/swift - - -# Add Swift required configuration files -COPY docker/rootfs / - -ENTRYPOINT ["/init"] diff --git a/docker/install_scripts/20_apk_install_py2.sh b/docker/install_scripts/20_apk_install_py2.sh deleted file mode 100755 index 12c28e59c4..0000000000 --- a/docker/install_scripts/20_apk_install_py2.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -set -e - -apk add --update \ - 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/python_test_dirs b/docker/install_scripts/python_test_dirs index 7441673abe..382d99284e 100644 --- a/docker/install_scripts/python_test_dirs +++ b/docker/install_scripts/python_test_dirs @@ -5,15 +5,3 @@ /opt/python/usr/local/lib/python3.6/sqlite3/test /opt/python/usr/local/lib/python3.6/test /opt/python/usr/local/lib/python3.6/tkinter/test -/opt/python/usr/local/lib/python2.7/bsddb/test -/opt/python/usr/local/lib/python2.7/ctypes/test -/opt/python/usr/local/lib/python2.7/distutils/tests -/opt/python/usr/local/lib/python2.7/email/test -/opt/python/usr/local/lib/python2.7/idlelib/idle_test -/opt/python/usr/local/lib/python2.7/json/tests -/opt/python/usr/local/lib/python2.7/lib-tk/test -/opt/python/usr/local/lib/python2.7/lib2to3/tests -/opt/python/usr/local/lib/python2.7/site-packages/simplejson/tests -/opt/python/usr/local/lib/python2.7/sqlite3/test -/opt/python/usr/local/lib/python2.7/test -/opt/python/usr/local/lib/python2.7/unittest/test