Merge "Base gitea-init on opendevorg/python-base"

.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
@@ -1124,8 +1127,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:
@@ -1187,8 +1196,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:

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 /
 

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