Browse Source

Revert "Revert "Update images to use python 3.8""

This reverts commit fe58e85bb1.

We resolved the twine issue with https://review.opendev.org/#/c/755670/

Depends-On: https://review.opendev.org/#/c/755670/
Change-Id: Iab73cf93dd7556609f7bddb13ab06ac7ab879d6b
changes/71/755671/1
James E. Blair 3 weeks ago
parent
commit
14a86c4d89
2 changed files with 6 additions and 6 deletions
  1. +4
    -4
      .zuul.yaml
  2. +2
    -2
      Dockerfile

+ 4
- 4
.zuul.yaml View File

@@ -141,8 +141,8 @@
allowed-projects: zuul/zuul
timeout: 2700 # 45 minutes
requires:
- python-builder-3.7-container-image
- python-base-3.7-container-image
- python-builder-3.8-container-image
- python-base-3.8-container-image
provides: zuul-container-image
vars: &zuul_image_vars
docker_images:
@@ -180,8 +180,8 @@
description: Build Docker images and upload to Docker Hub.
allowed-projects: zuul/zuul
requires:
- python-builder-3.7-container-image
- python-base-3.7-container-image
- python-builder-3.8-container-image
- python-base-3.8-container-image
provides: zuul-container-image
secrets:
name: docker_credentials


+ 2
- 2
Dockerfile View File

@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM docker.io/opendevorg/python-builder:3.7 as builder
FROM docker.io/opendevorg/python-builder:3.8 as builder
ENV DEBIAN_FRONTEND=noninteractive

# Optional location of Zuul API endpoint.
@@ -47,7 +47,7 @@ RUN mkdir /tmp/openshift-install \
&& echo $OPENSHIFT_SHA /tmp/openshift-install/openshift-client.tgz | sha256sum --check \
&& tar xvfz openshift-client.tgz --strip-components=1 -C /tmp/openshift-install

FROM docker.io/opendevorg/python-base:3.7 as zuul
FROM docker.io/opendevorg/python-base:3.8 as zuul
ENV DEBIAN_FRONTEND=noninteractive

COPY --from=builder /output/ /output


Loading…
Cancel
Save