diff options
| author | Zuul <zuul@review.opendev.org> | 2020-05-13 18:11:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-05-13 18:11:35 +0000 |
| commit | 2d2a4f4b57ea5f4cc2ecd29cf0291dc770edead3 (patch) | |
| tree | fd3a22635720ab8d3dadaba2320c5ea274f95196 | |
| parent | b7169355019cfc465a4bc69584ec098aa9b8b1e0 (diff) | |
| parent | 95d7ebb37009ec94b9d3b0f4fd03380cb90d8989 (diff) | |
| download | zuul-2d2a4f4b57ea5f4cc2ecd29cf0291dc770edead3.tar.gz | |
Merge "Switch back to python 3.7"
| -rw-r--r-- | .zuul.yaml | 8 | ||||
| -rw-r--r-- | Dockerfile | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.zuul.yaml b/.zuul.yaml index a2c34b51e..3084e68fb 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -130,8 +130,8 @@ allowed-projects: zuul/zuul timeout: 2700 # 45 minutes requires: - - python-builder-3.8-container-image - - python-base-3.8-container-image + - python-builder-container-image + - python-base-container-image provides: zuul-container-image vars: &zuul_image_vars docker_images: @@ -160,8 +160,8 @@ description: Build Docker images and upload to Docker Hub. allowed-projects: zuul/zuul requires: - - python-builder-3.8-container-image - - python-base-3.8-container-image + - python-builder-container-image + - python-base-container-image provides: zuul-container-image secrets: name: docker_credentials diff --git a/Dockerfile b/Dockerfile index 96c323217..45419c6c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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.8 as builder +FROM docker.io/opendevorg/python-builder as builder # Optional location of Zuul API endpoint. ARG REACT_APP_ZUUL_API @@ -39,7 +39,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.8 as zuul +FROM docker.io/opendevorg/python-base as zuul COPY --from=builder /output/ /output RUN /output/install-from-bindep \ |