go: re-do the entire thing
This is a mega-change, but attempting to split this up further is
probably not worth the effort.
Summary:
1. Bump up bazel, rules_go, and others.
2. Switch to new go target naming (bye bye go_default_library)
3. Move go deps to go.mod/go.sum, use make gazelle generate from that
4. Bump up Python deps a bit
And also whatever was required to actually get things to work - loads of
small useless changes.
Tested to work on NixOS and Ubuntu 20.04:
$ bazel build //...
$ bazel test //...
Change-Id: I8364bdaa1406b9ae4d0385a6b607f3e7989f98a9
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1583
Reviewed-by: q3k <q3k@hackerspace.pl>
diff --git a/devtools/gerrit/BUILD b/devtools/gerrit/BUILD
index 9f089fd..79cf6cb 100644
--- a/devtools/gerrit/BUILD
+++ b/devtools/gerrit/BUILD
@@ -1,26 +1,26 @@
load("@io_bazel_rules_docker//container:container.bzl", "container_image", "container_push")
container_image(
- name="with_plugins",
- base="@gerrit-3.3.2//image",
- files = [
- "//devtools/gerrit/gerrit-oauth-provider:gerrit-oauth-provider",
- "@com_googlesource_gerrit_plugin_owners//owners:owners.jar",
- ],
+ name = "with_plugins",
+ base = "@gerrit-3.3.2//image",
# we cannot drop it directly in /var/gerrit/plugins as that changes the
# directory owner to 0:0 and then breaks the gerrit installer that wants
# to overwrite plugins.
directory = "/var/gerrit-plugins",
+ files = [
+ "//devtools/gerrit/gerrit-oauth-provider",
+ "@com_googlesource_gerrit_plugin_owners//owners:owners.jar",
+ ],
)
container_image(
name = "with_theme",
base = ":with_plugins",
+ directory = "/var/gerrit-theme",
files = [
"theme/etc/GerritSite.css",
"theme/static/pepper-icon.png",
],
- directory = "/var/gerrit-theme",
)
# Add gerrit 3.3.2 with backported fix. See org_q3k_gerrit_3_3_2_backport in
@@ -28,25 +28,25 @@
# TODO(q3k): drop once gerrit > 3.3.2 lands.
container_image(
name = "with_gerrit_override",
- base="with_theme",
+ base = "with_theme",
+ directory = "/var/gerrit/bin/",
files = [
"@org_q3k_gerrit_3_3_2_backport//file:gerrit.war",
],
- directory = "/var/gerrit/bin/",
)
container_image(
- name="3.3.2-r4",
- base=":with_gerrit_override",
- files = [":entrypoint.sh"],
+ name = "3.3.2-r4",
+ base = ":with_gerrit_override",
directory = "/",
entrypoint = ["/entrypoint.sh"],
+ files = [":entrypoint.sh"],
)
container_push(
name = "push",
- image = ":3.3.2-r4",
format = "Docker",
+ image = ":3.3.2-r4",
registry = "registry.k0.hswaw.net",
repository = "q3k/gerrit",
tag = "3.3.2-r4",