diff --git a/.zuul.yaml b/.zuul.yaml index 03d809667..cb923f349 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -154,8 +154,8 @@ dependencies: - opendev-buildset-registry requires: - - python-builder-container-image - - python-base-container-image + - python-builder-3.7-container-image + - python-base-3.7-container-image provides: nodepool-container-image vars: &nodepool_image_vars docker_images: @@ -174,8 +174,8 @@ parent: opendev-upload-docker-image description: Build Docker images and upload to Docker Hub. requires: - - python-builder-container-image - - python-base-container-image + - python-builder-3.7-container-image + - python-base-3.7-container-image provides: nodepool-container-image vars: *nodepool_image_vars secrets: @@ -204,8 +204,8 @@ - openstack/diskimage-builder - openstack/openstacksdk requires: - - python-builder-container-image - - python-base-container-image + - python-builder-3.7-container-image + - python-base-3.7-container-image provides: nodepool-siblings-container-image vars: docker_images: diff --git a/Dockerfile b/Dockerfile index 3a01cc501..f57bf2d93 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,14 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM docker.io/opendevorg/python-builder as builder +FROM docker.io/opendevorg/python-builder:3.7 as builder # ============================================================================ ARG ZUUL_SIBLINGS="" COPY . /tmp/src RUN assemble -FROM docker.io/opendevorg/python-base as nodepool-base +FROM docker.io/opendevorg/python-base:3.7 as nodepool-base # ============================================================================ COPY --from=builder /output/ /output