From 408d5448989172b77c83f5f0420c78e12c3616b6 Mon Sep 17 00:00:00 2001 From: Serge Bazanski Date: Wed, 17 Mar 2021 22:14:53 +0100 Subject: [PATCH] devtools/gerrit: attempt to deploy theme This doesn't entirely work, as we need to use PolyGerrit 3 compatible theme injection. Change-Id: I13305a4774028bdb92c1449ddb461b59ce8ae82f --- devtools/gerrit/BUILD | 19 +++++++++++++++---- devtools/gerrit/entrypoint.sh | 4 ++++ devtools/gerrit/kube/gerrit.libsonnet | 2 +- devtools/gerrit/theme/etc/GerritSite.css | 7 +++++++ devtools/gerrit/theme/static/pepper-icon.png | Bin 0 -> 5198 bytes 5 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 devtools/gerrit/theme/etc/GerritSite.css create mode 100644 devtools/gerrit/theme/static/pepper-icon.png diff --git a/devtools/gerrit/BUILD b/devtools/gerrit/BUILD index 3a26e392..c8ebfd6e 100644 --- a/devtools/gerrit/BUILD +++ b/devtools/gerrit/BUILD @@ -12,9 +12,20 @@ container_image( # to overwrite plugins. directory = "/var/gerrit-plugins", ) + container_image( - name="3.3.2-r1", - base=":with_plugins", + name = "with_theme", + base = ":with_plugins", + files = [ + "theme/etc/GerritSite.css", + "theme/static/pepper-icon.png", + ], + directory = "/var/gerrit-theme", +) + +container_image( + name="3.3.2-r3", + base=":with_theme", files = [":entrypoint.sh"], directory = "/", entrypoint = ["/entrypoint.sh"], @@ -22,9 +33,9 @@ container_image( container_push( name = "push", - image = ":3.3.2-r1", + image = ":3.3.2-r3", format = "Docker", registry = "registry.k0.hswaw.net", repository = "q3k/gerrit", - tag = "3.3.2-r1", + tag = "3.3.2-r3", ) diff --git a/devtools/gerrit/entrypoint.sh b/devtools/gerrit/entrypoint.sh index ffea5f30..f3032635 100755 --- a/devtools/gerrit/entrypoint.sh +++ b/devtools/gerrit/entrypoint.sh @@ -19,6 +19,10 @@ cp /var/gerrit-secure/secure.config /var/gerrit/etc/secure.config cp /var/gerrit-plugins/* /var/gerrit/plugins/ +mkdir -p /var/gerrit/static +cp -r /var/gerrit-theme/*png /var/gerrit/static/ +cp -r /var/gerrit-theme/*css /var/gerrit/etc/ + echo "Starting config updater..." # Keep copying config over in background. We cannot run directly from # the configmap filesystem as gerrit really wants a read-write FS. diff --git a/devtools/gerrit/kube/gerrit.libsonnet b/devtools/gerrit/kube/gerrit.libsonnet index 0106f174..ba3180ad 100644 --- a/devtools/gerrit/kube/gerrit.libsonnet +++ b/devtools/gerrit/kube/gerrit.libsonnet @@ -38,7 +38,7 @@ local kube = import "../../../kube/kube.libsonnet"; address: "gerrit@hackerspace.pl", }, - tag: "3.3.2-r1", + tag: "3.3.2-r3", image: "registry.k0.hswaw.net/q3k/gerrit:" + cfg.tag, resources: { requests: { diff --git a/devtools/gerrit/theme/etc/GerritSite.css b/devtools/gerrit/theme/etc/GerritSite.css new file mode 100644 index 00000000..97074f2c --- /dev/null +++ b/devtools/gerrit/theme/etc/GerritSite.css @@ -0,0 +1,7 @@ +html { + --header-background-color: #347dbe; + --header-text-color: #fff; + --header-title-content: "Gerrit"; + --header-icon: url('/static/pepper-icon.png'); + --header-icon-size: 1em; +} diff --git a/devtools/gerrit/theme/static/pepper-icon.png b/devtools/gerrit/theme/static/pepper-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7d12ab8001644a199a3a94a981b539a7449f37f1 GIT binary patch literal 5198 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 IM6N<$f-NNIl>h($ literal 0 HcmV?d00001