From cf673e7d808da34c622f2a334d04ac2b6942b7c1 Mon Sep 17 00:00:00 2001 From: Ian H Pittwood Date: Fri, 16 Aug 2019 08:44:33 -0500 Subject: [PATCH] Fix OpenSUSE image build Change-Id: I17e72e8239a5f4c0875e6ff736ca74393e86284c --- .zuul.yaml | 2 -- images/spyglass/Dockerfile.opensuse_15 | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 2c94905..e15e2e3 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -82,7 +82,6 @@ - job: name: spyglass-docker-build-gate-opensuse timeout: 1800 - voting: false run: tools/gate/playbooks/docker-image-build.yaml nodeset: spyglass-single-node vars: @@ -129,7 +128,6 @@ - job: name: spyglass-docker-publish-opensuse timeout: 1800 - voting: false run: tools/gate/playbooks/docker-image-build.yaml nodeset: spyglass-single-node secrets: diff --git a/images/spyglass/Dockerfile.opensuse_15 b/images/spyglass/Dockerfile.opensuse_15 index 1689421..22e04a9 100644 --- a/images/spyglass/Dockerfile.opensuse_15 +++ b/images/spyglass/Dockerfile.opensuse_15 @@ -17,14 +17,15 @@ RUN set -x \ curl \ gcc \ git-core \ + python3 \ python3-dbm \ python3-devel \ python3-pip \ python3-setuptools \ which \ && zypper --non-interactive --no-gpg-checks ar -f https://download.opensuse.org/repositories/devel:languages:python/openSUSE_Leap_15.1/devel:languages:python.repo \ - && zypper --non-interactive --no-gpg-checks install python3-six-1.12.0-lp151.80.1.noarch \ - && python3 -m pip install -U pip \ + && zypper --non-interactive --no-gpg-checks install python3-six-1.12.0-lp151.80.1.noarch +RUN pip3 install -U pip \ && zypper clean -a \ && rm -rf \ /tmp/* \