Merge "gitea: use assets bundle"

2021-09-07 16:57:41 +00:00 · 2021-09-07 16:57:41 +00:00 · 669300d7e2
commit 669300d7e2
parent 7a9c9475a7 e772abaf96
6 changed files with 15 additions and 51 deletions
--- a/docker/gitea/Dockerfile
+++ b/docker/gitea/Dockerfile
@ -1,3 +1,4 @@
+# syntax=docker/dockerfile:1.3
 # Copyright (c) 2018 Red Hat, Inc.
 # Copyright (c) 2016 The Gitea Authors
 # Copyright (c) 2015 The Gogs Authors
@ -82,6 +83,7 @@ RUN ln -s /app/gitea/gitea /usr/local/bin/gitea

 # Copy our custom templates
 COPY custom/ /custom/
+RUN --mount=type=bind,from=opendevorg/assets,target=/tmp/assets cp /tmp/assets/* /custom/public/img/

 ENV GITEA_CUSTOM /custom

--- a/docker/gitea/custom/public/img/favicon.ico
+++ b/docker/gitea/custom/public/img/favicon.ico
--- a/docker/gitea/custom/public/img/logo.svg
+++ b/docker/gitea/custom/public/img/logo.svg
@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg2"
-   version="1.1"
-   xml:space="preserve"
-   width="177.285"
-   height="177.285"
-   viewBox="0 0 177.28501 177.28501"><metadata
-     id="metadata8"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs6"><clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath66"><path
-         d="m 533,244.125 h 72 V 316 h -72 z"
-         id="path68" /></clipPath><clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath82"><path
-         d="M 471.926,323 H 499 v 28 h -27.074 z"
-         id="path84" /></clipPath><clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath92"><path
-         d="m 502,323 h 27 v 37.035 h -27 z"
-         id="path94" /></clipPath><clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath110"><path
-         d="m 645,324 h 21.719 v 26 H 645 Z"
-         id="path112" /></clipPath></defs><g
-     transform="matrix(2.5,0,0,2.5,-1334.6675,-610.3125)"
-     id="g62"><g
-       clip-path="url(#clipPath66)"
-       id="g64"><path
-         id="path70"
-         style="fill:#ee265e;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 604.781,279.582 c 0,-19.582 -15.875,-35.457 -35.457,-35.457 -19.582,0 -35.457,15.875 -35.457,35.457 0,19.582 15.875,35.457 35.457,35.457 19.582,0 35.457,-15.875 35.457,-35.457" /><path
-         id="path72"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 546.879,284.004 c 0,-3 2.441,-5.442 5.441,-5.442 3,0 5.442,2.442 5.442,5.442 0,3.004 -2.442,5.441 -5.442,5.441 -3,0 -5.441,-2.437 -5.441,-5.441 m 13.004,0 c 0,-4.168 -3.391,-7.563 -7.563,-7.563 -4.172,0 -7.562,3.395 -7.562,7.563 0,4.172 3.39,7.566 7.562,7.566 4.172,0 7.563,-3.394 7.563,-7.566" /><path
-         id="path74"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 583.555,289.449 h -5.442 c -3,0 -5.441,-2.441 -5.441,-5.445 0,-3 2.441,-5.442 5.441,-5.442 h 5.442 z m 1.062,-13.008 h -6.504 c -4.172,0 -7.562,3.395 -7.562,7.563 0,4.172 3.39,7.566 7.562,7.566 h 6.504 c 0.586,0 1.059,-0.476 1.059,-1.062 V 277.5 c 0,-0.586 -0.473,-1.059 -1.059,-1.059" /><path
-         id="path76"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 590.906,285.203 c -0.664,0 -1.199,-0.539 -1.199,-1.199 0,-0.66 0.535,-1.195 1.199,-1.195 0.66,0 1.196,0.535 1.196,1.195 0,0.66 -0.536,1.199 -1.196,1.199 m 0,10.465 c 0.66,0 1.196,0.539 1.196,1.199 0,0.66 -0.536,1.199 -1.196,1.199 -0.664,0 -1.199,-0.539 -1.199,-1.199 0,-0.66 0.535,-1.199 1.199,-1.199 m -52.019,-15.242 c 0.222,-0.227 0.527,-0.352 0.843,-0.352 0.321,0 0.622,0.125 0.848,0.352 0.469,0.469 0.469,1.23 0,1.695 -0.453,0.453 -1.242,0.453 -1.695,0 -0.465,-0.465 -0.465,-1.226 0.004,-1.695 m 10.359,-7.742 c -0.453,0.453 -1.242,0.453 -1.695,0 -0.469,-0.469 -0.469,-1.227 0,-1.696 0.234,-0.234 0.539,-0.351 0.847,-0.351 0.309,0 0.614,0.117 0.848,0.351 0.465,0.469 0.465,1.227 0,1.696 m 45.566,-13.707 h -10.195 c -0.586,0 -1.062,0.476 -1.062,1.062 v 10.043 h -5.512 c -5.828,0 -10.828,3.609 -12.898,8.707 -0.676,-1.652 -1.68,-3.195 -3.02,-4.535 -2.887,-2.887 -6.797,-4.313 -10.836,-4.02 -0.148,-0.265 -0.32,-0.519 -0.543,-0.746 -1.293,-1.293 -3.398,-1.293 -4.695,0 -1.293,1.293 -1.293,3.399 0,4.696 0.629,0.625 1.461,0.972 2.347,0.972 0.887,0 1.719,-0.347 2.348,-0.972 0.52,-0.52 0.82,-1.176 0.922,-1.852 3.344,-0.176 6.566,1.031 8.957,3.422 4.602,4.601 4.602,12.09 0,16.691 -4.602,4.602 -12.086,4.602 -16.687,0 -2.137,-2.136 -3.34,-4.945 -3.438,-7.949 0.594,-0.141 1.137,-0.434 1.578,-0.875 1.293,-1.293 1.293,-3.398 0,-4.695 -1.254,-1.254 -3.441,-1.25 -4.691,0 -1.297,1.297 -1.297,3.402 -0.004,4.695 0.293,0.289 0.629,0.512 0.988,0.672 0.051,3.648 1.481,7.066 4.067,9.652 2.714,2.715 6.277,4.071 9.843,4.071 3.567,0 7.129,-1.356 9.844,-4.071 1.363,-1.363 2.379,-2.937 3.059,-4.621 2.093,5.043 7.066,8.602 12.859,8.602 h 9.73 c 0.446,1.308 1.676,2.262 3.133,2.262 1.828,0 3.317,-1.493 3.317,-3.321 0,-1.832 -1.489,-3.32 -3.317,-3.32 -1.457,0 -2.687,0.949 -3.133,2.258 h -9.73 c -6.508,0 -11.801,-5.293 -11.801,-11.801 0,-6.508 5.293,-11.801 11.801,-11.801 h 6.574 c 0.586,0 1.059,-0.473 1.059,-1.058 v -10.047 h 8.078 v 2.722 l -2.852,0.004 c -0.582,0 -1.058,0.477 -1.058,1.059 v 15.992 c -1.309,0.445 -2.258,1.672 -2.258,3.129 0,1.832 1.488,3.32 3.32,3.32 1.828,0 3.317,-1.488 3.317,-3.32 0,-1.457 -0.95,-2.684 -2.258,-3.129 v -14.93 l 2.847,-0.004 c 0.586,0 1.059,-0.476 1.059,-1.058 v -4.844 c 0,-0.586 -0.473,-1.062 -1.059,-1.062" /></g></g></svg>
--- a/docker/gitea/custom/public/img/opendev-sm.png
+++ b/docker/gitea/custom/public/img/opendev-sm.png
--- a/zuul.d/docker-images/gitea.yaml
+++ b/zuul.d/docker-images/gitea.yaml
@ -34,8 +34,10 @@
    name: system-config-build-image-gitea
    description: Build a gitea image.
    parent: system-config-build-image
+    requires: assets-container-image
    provides: gitea-container-image
    vars: &gitea_vars
+      docker_use_buildkit: true
      docker_images:
        - context: docker/gitea
          target: gitea
@ -51,6 +53,7 @@
    name: system-config-upload-image-gitea
    description: Build and upload a gitea image.
    parent: system-config-upload-image
+    requires: assets-container-image
    provides: gitea-container-image
    vars: *gitea_vars
    files: *gitea_files
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@ -113,7 +113,11 @@
              - name: system-config-build-image-python-base-3.8
                soft: true
        - system-config-build-image-etherpad
-        - system-config-build-image-gitea
+        - system-config-build-image-gitea:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-build-image-assets
+                soft: true
        - system-config-build-image-grafana
        - system-config-build-image-haproxy-statsd:
            dependencies:
@ -257,7 +261,11 @@
        - system-config-upload-image-hound
        - system-config-upload-image-assets
        - system-config-upload-image-etherpad
-        - system-config-upload-image-gitea
+        - system-config-upload-image-gitea:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-upload-image-assets
+                soft: true
        - system-config-upload-image-grafana
        - system-config-upload-image-refstack
        - system-config-upload-image-haproxy-statsd: