From ccaf54c86647c92e768437d966b3b7cd25fd134d Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Wed, 23 Oct 2019 17:03:58 +0900
Subject: [PATCH] Base gitea-init on opendevorg/python-base

So that we can keep one python base image for our python things,
base jinja-init and gitea-init on python-base. Also, tie jinja-init
to python-base in the dependency graph and gitea-init to jinja-init.
This way if python-base updates, we'll rebuild our python images.

Update FROM lines to use full paths to images.

Change-Id: I554bf07fa8e458e443729cf4b8f40d7ceeaafa04
---
 .zuul.yaml                   | 23 +++++++++++++++++++----
 docker/gitea-init/Dockerfile |  2 +-
 docker/jinja-init/Dockerfile |  4 ++--
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index fd65092f1b..5297fd3aaf 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -60,6 +60,7 @@
           repository: opendevorg/jinja-init
     files: &jinja-init_files
       - docker/jinja-init/.*
+      - docker/python-base/.*
 
 - job:
     name: system-config-upload-image-jinja-init
@@ -87,6 +88,8 @@
           repository: opendevorg/gitea-init
     files: &gitea-init_files
       - docker/gitea-init/.*
+      - docker/jinja-init/.*
+      - docker/python-base/.*
 
 - job:
     name: system-config-upload-image-gitea-init
@@ -1067,8 +1070,14 @@
         - system-config-run-zuul-preview
         - system-config-run-letsencrypt
         - system-config-build-image-bazel
-        - system-config-build-image-jinja-init
-        - system-config-build-image-gitea-init
+        - system-config-build-image-jinja-init:
+            dependencies:
+              - name: system-config-build-image-python-base
+                soft: true
+        - system-config-build-image-gitea-init:
+            dependencies:
+              - name: system-config-build-image-jinja-init
+                soft: true
         - system-config-build-image-gitea
         - system-config-build-image-gerrit-base:
             dependencies:
@@ -1126,8 +1135,14 @@
         - system-config-run-zuul-preview
         - system-config-run-letsencrypt
         - system-config-upload-image-bazel
-        - system-config-upload-image-jinja-init
-        - system-config-upload-image-gitea-init
+        - system-config-upload-image-jinja-init:
+            dependencies:
+              - name: system-config-build-image-python-base
+                soft: true
+        - system-config-upload-image-gitea-init:
+            dependencies:
+              - name: system-config-build-image-jinja-init
+                soft: true
         - system-config-upload-image-gitea
         - system-config-upload-image-gerrit-base:
             dependencies:
diff --git a/docker/gitea-init/Dockerfile b/docker/gitea-init/Dockerfile
index a6e36e73be..412d398987 100644
--- a/docker/gitea-init/Dockerfile
+++ b/docker/gitea-init/Dockerfile
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-FROM opendevorg/jinja-init as gitea-init
+FROM docker.io/opendevorg/jinja-init as gitea-init
 
 COPY entrypoint.sh /
 
diff --git a/docker/jinja-init/Dockerfile b/docker/jinja-init/Dockerfile
index 5c4a6b16a9..ef7c3297b0 100644
--- a/docker/jinja-init/Dockerfile
+++ b/docker/jinja-init/Dockerfile
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-FROM python:slim as build
+FROM docker.io/opendevorg/python-base as build
 
 RUN apt-get update && apt-get -y install \
     git \
@@ -25,7 +25,7 @@ WORKDIR /src/jinja-init
 
 RUN git checkout 8c13a44124a5a363519df787b1cd0abd1198b8df
 
-FROM python:slim as jinja-init
+FROM docker.io/opendevorg/python-base as jinja-init
 
 RUN pip install jinja2