293 Commits

Author SHA1 Message Date
Zuul
28243caa7f Merge "Adjust RefStack build for osf->openinfra rename" 2021-11-08 02:20:52 +00:00
Zuul
7ef6520aad Merge "Update zookeeper-statsd to python3.9 on bullseye" 2021-11-05 20:46:07 +00:00
Zuul
a4cf92bb56 Merge "Run zookeeper-statsd as the zookeeper user" 2021-11-05 20:46:04 +00:00
Clark Boylan
2828a51ef9 Run haproxy-statsd as uid 1000
This aligns it with what we have done for zookeeper-statsd.

Change-Id: Ida0e3c3e7dbcaf915119f7e2677edf95c7550eea
2021-11-05 16:45:32 +00:00
Clark Boylan
0f51ccf87f Update zookeeper-statsd to python3.9 on bullseye
We're currently on python3.9 on buster.

Change-Id: Ib8be56d44c89850cd63d700694cda174aa2efa4f
2021-11-04 16:49:04 -07:00
Clark Boylan
47cbfbf96a Run zookeeper-statsd as the zookeeper user
We may as well align it with the other processes running on this system.

Change-Id: I6de0e5463b3dc66eae46a771d70d1d741527a35e
2021-11-04 16:48:59 -07:00
Clark Boylan
fd0aba7445 Update haproxy-statsd to bullseye and python3.9
We should generally try to keep these things up to date so do it now.

Change-Id: I59c21959094a87eb5a1e6f80e0a72be47370c072
2021-11-04 15:53:35 -07:00
Ian Wienand
6e232716e7 gerrit: update theme to javascript plugin
Gerrit 3.4 deprecates HTML-based plugins, so the old theme doesn't
work.  I have reworked this into a javascript plugin.

This should look the same, although I've achieved things in different
ways.

This doesn't register light and dark variants; since
background-primary-color is white, by setting the
header-background-color to this we get white behind the header bar,
and it correctly switches to the default black(ish) when in dark mode
(currently its seems the header doesn't obey dark mode, so this is an
improvement).

I'm not sure what's going on with the extant header-border-image which
is a linear gradient all of the same color.  I modified this down to
1px (same as default) and made it fade in-and-out of the logo colour,
just for fun.

Change-Id: Ia2e32731c1cfe97639de2ec0e7660c7ed583e045
2021-11-04 18:45:18 +11:00
Clark Boylan
04d60e25bf Rebuild gerrit images
Get the latest and greated gerrit and openjdk stuff.

Change-Id: I540d4d12fc4387e3912c191413aa77ce8ed60207
2021-11-01 13:18:47 -07:00
Clark Boylan
f2cd358b70 Upgrade to gitea 1.15.6
Another bug fix release. We upgrade to keep up and not fall behind.
Release notes can be found at:

  https://github.com/go-gitea/gitea/blob/v1.15.6/CHANGELOG.md

Change-Id: I44874476d6fd09f3333205b3036ed12000560cba
2021-10-28 08:37:04 -07:00
Jeremy Stanley
e9f281d3b8 Adjust RefStack build for osf->openinfra rename
All the osf/ namespace Git repositories have moved into a new and
more appropriate openinfra/ namespace, so make the necessary
adjustments to RefStack's image build and operations document.

Change-Id: I01c8d153321a617fbc78c2d3c99102185b03243d
Depends-On: https://review.opendev.org/808479
2021-10-26 18:00:02 +00:00
Clark Boylan
cc41e880eb Upgrade gitea to 1.15.5
Changelog at:

  https://github.com/go-gitea/gitea/blob/v1.15.5/CHANGELOG.md

Change-Id: I4948aaa6d26364ce8f9de66ce83d1b40c763e132
2021-10-25 08:22:03 -07:00
Clark Boylan
2f11da87b0 Build Gerrit 3.3.7 images
This updates our Gerrit 3.3 images to the new 3.3.7 release.

Change-Id: Ib676be49bcc9cd4633dbe6fe87dd6e3a32185a55
2021-10-14 11:46:44 -07:00
Zuul
6b05c7db38 Merge "Force gerrit image build to tag 3.4" 2021-10-11 17:50:53 +00:00
Clark Boylan
9eebd3d0fc Force gerrit image build to tag 3.4
We added 3.4 jobs but they aren't running because we haven't tagged 3.4
images on dockerhub successfully.

Change-Id: I1fce44fe562a994c5513ceeb96270a4d5f7c40c3
2021-10-11 08:31:01 -07:00
Clark Boylan
b6d121627c Update gitea to 1.15.4
They just released a 1.15.4 version with a number of bugfixes.

Changelog at:

  https://github.com/go-gitea/gitea/blob/v1.15.4/CHANGELOG.md

Change-Id: Idf5f5a0b2d7bc5acbe79fb38753671d21c71e288
2021-10-08 12:13:22 -07:00
Zuul
91c6b2ae84 Merge "Build our gerrit images on Bullseye" 2021-10-07 00:12:30 +00:00
Zuul
d108da5785 Merge "Upgrade gitea to 1.15.3" 2021-10-06 22:47:20 +00:00
Zuul
9f1f1ef811 Merge "Update our gitea images to bullseye" 2021-10-06 15:53:35 +00:00
Clark Boylan
7df09ecef5 Properly copy gerrit static files
Dockerfile's COPY directive only copies the contents of a directory when
src is a directory. It does not copy the directory itself. This meant
the copy we were using to copy static files put them in /var/gerrit and
not /var/gerrit/static where we need them to be.

Update the Dockerfile to copy to /var/gerrit/static/ to fix this and add
some resource fetching tests to ensure they are served correctly.

Change-Id: I3bb4c06f3d7a57dcfccbbdb27cb8405586949949
2021-09-27 15:04:15 -07:00
Clark Boylan
048a918a61 Upgrade gitea to 1.15.3
We move robots.txt to custom/ instead of custom/public/ as
custom/public/ is now served at /assets/ via the gitea webserver and we
need robots.txt at the root. Related to this we update image urls to be
prefixed with AssetUrlPrefix in their paths so that if this path changes
against in the future we should automatically accomodate that.

Change-Id: I8ce5fe8ff342617ff156a401be8418d593fd35c4
2021-09-27 12:54:52 -07:00
Zuul
64d0939da2 Merge "gerrit: copy static files directly into container image" 2021-09-27 16:54:16 +00:00
Clark Boylan
eb27f5e5b7 Upgrade gitea to 1.14.7
This has a number of bugfixes and seems like a good intermediate step
before we upgrade to 1.15.x.

Change-Id: If30693a849e34a4eed6fdec09b75c438f815621d
2021-09-21 11:26:39 -07:00
Ian Wienand
227839e8ad gerrit: copy static files directly into container image
Copy static files directly into the container image instead of
managing them dynamically with Ansible.

Change-Id: I0ebe40ad2a97e87b00137af7c93a3ffa84929a2e
2021-09-17 12:35:12 +10:00
Ian Wienand
791d09be46 gerrit: copy theme plugin from plugins/
This is a minor refactor to make a follow-on that copies static files
more logical.

Change-Id: Id31106a875926dd4eca31972b1fc52a1cd0b67bd
2021-09-17 12:35:12 +10:00
Ian Wienand
8f8100ed28 gitea: cleanup logo assets
I can not find anywhere we use the logo-*.png files currently in the
gitea public directory.  Remove these as they're all trivially
re-created via the SVG if we find we want them.

Similarly I don't see anywhere we use "opendev-icon.svg"; it is the
same as "logo.svg".  This is removed.

Move the logo with text "opendev.svg" into the assets bundle (only
user of this I can find is paste.opendev.org).

Also move in the favicon.<png/svg> files

Note all these are copied back into the gitea container at the same
location so nothing will break.  However we wish to have the
identified external users not rely on files served as gitea assets as
the new version of gitea will move them.

Change-Id: I4f6c64b4042a3f0a17ce4ee59ee8bd0d61648bcc
2021-09-17 12:35:07 +10:00
Clark Boylan
88a6a202e9 Build our gerrit images on Bullseye
This is a bit of spring cleaning. Previously we based on images on
Buster but Bullseye exists now so give it a go.

Change-Id: Icc3d79b361e41df2f2f063993fd206ab7d992f75
2021-09-15 13:45:31 -07:00
Clark Boylan
17ba858b19 Update our gitea images to bullseye
To do this we also update jinja-init to bullseye and gitea seems to be
the only user of this image. The impact of this should be fairly self
contained to gitea.

Note this update isn't urgent, but good hygiene. We should coordinate
this update with the 1.15.x gitea upgrade and do them in such a sequence
that we can identify problems easily if they pop up.

Change-Id: Ia0075416a1d8a067cfecd26c03f8db9641cbcb89
2021-09-15 10:49:42 -07:00
Ian Wienand
e772abaf96 gitea: use assets bundle
This uses the opendev assets bundle image created with
I3166679bde6d771276289b9d32e7e4407957b2f8.

The mount options require using BuildKit, hence the Dockerfile update.

Otherwise conceptually it's fairly simple; copy in the files from the
opendevorg/assets image rather than the file-system.

Change-Id: I36bdc76471eec5380a676ebcdd885a88d3985976
2021-09-06 15:07:36 +10:00
Monty Taylor
8dbf0a3d82 Produce both buster and bullseye container images
This will allow us to roll out consumption forward in a
methodical manner.

This reverts commit 45caec4d43900bc66fb0b8c219c6dcc3180ca8aa.

Note the weird ARG definitions are there for a reason:
https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact

Change-Id: I81174ac035164695f1c27c9662f25335b78c2e64
2021-08-28 16:46:29 -07:00
James E. Blair
45caec4d43 Pin base and builder images to buster
There's some more work before our consumers can switch to bullseye.
To make this process more tractable, revert the recent backport
addition, and specify that we want bullseye images from upstream.

That gets us back to where we were at the start of this.  Next,
we can start building 2x images of python-base/builder and tag
them with bullseye or buster.  Then the consumers can specify
which tags, then start switching.

Revert "Add backports repos to base and builder images"

This reverts commit b217e38904da3ccab6eb96251376f1635ee55d21.

Revert "Update matrix-eavesdrop for bullseye"

This reverts commit fc38c6975367c09d003474ebd7bfefc465459a06.

Change-Id: Id21681342fe5268296128c1b09436a80c46e3169
2021-08-27 08:03:38 -07:00
Zuul
a6beb03ceb Merge "Update matrix-eavesdrop for bullseye" 2021-08-26 22:34:09 +00:00
Zuul
aaeebdda18 Merge "Add backports repos to base and builder images" 2021-08-26 20:37:44 +00:00
Monty Taylor
fc38c69753 Update matrix-eavesdrop for bullseye
Bullseye means we don't need the backports repos. Also, the upstream
images have bullseye-backports in them already now.

Depends-On: https://review.opendev.org/c/opendev/system-config/+/800318
Change-Id: I3813068c21d06d9b182fe81efcf2e636b2170c4a
2021-08-26 15:11:37 -05:00
Monty Taylor
b217e38904 Add backports repos to base and builder images
These don't install anything by default, but allow people
to easily opt-in to a backport package if they need to without
lots of extra lines of boilerplate.

The base python image is on bullseye now instead of buster. That
means the libffi version is 7 not 6.

Change-Id: I0e0c2669d838fb622422f696f73e96e409157270
2021-08-26 11:58:59 -05:00
Zuul
c74d9fc54d Merge "Update Gerrit images to most recent releases" 2021-08-23 16:58:40 +00:00
James E. Blair
e2a6680f85 Remove matrix well-known files from gitea image
These are served from apache now, remove the no-longer used copies.

Change-Id: I9cecbfe4fbd358377fe63b5b3978c455cc208e05
2021-08-20 22:06:32 -07:00
Clark Boylan
f4c1735dfb Update Gerrit images to most recent releases
There are new releases of Gerrit. Let's update our 3.2 and 3.3 images to
match.

Change-Id: Id06cbb5eb2c7e6af30d579327b4a4c89b92e6d8d
2021-08-20 15:55:53 -07:00
James E. Blair
0536be7c2c Matrix-eavesdrop: handle notices
This will log the gerritbot messages

Change-Id: Ic777bf8f8b7d48ae177ea432071df232a39ee9a2
2021-08-20 09:35:38 -07:00
Zuul
805cc31912 Merge "Upgrade etherpad to 1.8.14" 2021-08-13 14:31:21 +00:00
Clark Boylan
5f51af5974 Upgrade etherpad to 1.8.14
This upgrades etherpad to 1.8.14 which will pull in a number of fixes as
well as dropped support for IE.

Change-Id: If9a85d3b606af700da1ab34f1a893d9c3b5f8416
2021-08-12 08:31:54 -07:00
Zuul
92ead4baa1 Merge "Remove the mysql support from our gerrit role and image" 2021-08-10 23:32:37 +00:00
Clark Boylan
75e0cf106a Remove the mysql support from our gerrit role and image
We are now using the mariadb jdbc connector in production and no longer
need to include the mysql legacy connector in our images. We also don't
need support for h2 or mysql as testing and prod are all using the
mariadb connector and local database.

Note this is a separate change to ensure everything is happy with the
mariadb connector before we remove the fallback mysql connector from our
images.

Change-Id: I982d3c3c026a5351bff567ce7fbb32798718ec1b
2021-08-10 13:06:54 -07:00
Zuul
2f230ef920 Merge "hound: clear git lockfiles before starting daemon" 2021-08-10 04:09:14 +00:00
Clark Boylan
8a85c1dce1 Update to gitea v1.14.6
There are no diffs in the template files between v1.14.5 and v1.14.6.
This should be a safe update.

Upstream indicates bugfixes around cancelling batched file catting as
well as security updates around jwt and auth.

Change-Id: I2799c62bb3f1fb5e62fc6e3773ec8b9a38ceddfa
2021-08-05 13:17:16 -07:00
Zuul
63f031f079 Merge "Rebuild gerrit images to include fixes" 2021-08-05 15:53:08 +00:00
Clark Boylan
ecbe89f88f Update the python docker images again
We had an image promote failure for python-base:3.8. Due to docker
hub making it very difficult to know if old tags have been cleaned up we
are not sure that reenqueing the previous chagne to zuul will do the
right thing. It may downgrade the latest tag on some of our images. To
avoid any confusion over what is latest we just have zuul build new
images and promote them again.

Change-Id: Iaa859396030f1110b43788e73e9644a97e2ada9b
2021-08-03 13:00:22 -07:00
Zuul
125a330769 Merge "Use nodejs 14" 2021-08-03 17:58:17 +00:00
Zuul
e73739f397 Merge "Update our python-base and -builder images" 2021-08-03 17:23:56 +00:00
Clark Boylan
e5ea6ebc38 Rebuild gerrit images to include fixes
We upstreamed fixes for the mariadb jdbc connector and users being able
to orphan their accounts through accidental deletion of their openid
external ids. These fixes are now present in both the stable-3.2 and
stable-3.3 branches of gerrit. We should rebuild these images to ensure
our images include the fixes.

Note that stable-3.4 does not yet include these fixes but should in
time.

We will update our jdbc connection url in a followup change as we don't
auto update our images. This way we can ensure that the new image is
ready to go before updating that config.

Change-Id: Id23215ddfb3bd4424109e77ecd3480ed2375431d
2021-08-03 09:05:14 -07:00