diff options
| author | Tobias Henkel <tobias.henkel@bmw.de> | 2020-05-12 20:41:26 +0200 |
|---|---|---|
| committer | Tobias Henkel <tobias.henkel@bmw.de> | 2020-05-13 08:39:42 +0200 |
| commit | 95d7ebb37009ec94b9d3b0f4fd03380cb90d8989 (patch) | |
| tree | 5aaaf3802d238d50fddc22a2eb3084d378ae34bb | |
| parent | 3a2c4d80f42e49d48ff3d2c24bde7dfd8cf67eb7 (diff) | |
| download | zuul-95d7ebb37009ec94b9d3b0f4fd03380cb90d8989.tar.gz | |
Switch back to python 3.7
Ansible 2.7 is known to be broken with python 3.8 so switch back to
python 3.7 for now until we dropped support for Ansible 2.7.
Change-Id: Ibfe1b226630c8db202a294590c6435666afcb62d
| -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 \ |