forked from hswaw/hscloud
Merge changes Iac1fdee4,I73a5beaf
* changes: gerrit: bump to 3.3.2 WORKSPACE: bump rules_docker
This commit is contained in:
commit
ee3c90cbf0
3 changed files with 11 additions and 11 deletions
12
WORKSPACE
12
WORKSPACE
|
@ -104,9 +104,9 @@ go_repositories()
|
|||
|
||||
http_archive(
|
||||
name = "io_bazel_rules_docker",
|
||||
sha256 = "dc97fccceacd4c6be14e800b2a00693d5e8d07f69ee187babfd04a80a9f8e250",
|
||||
strip_prefix = "rules_docker-0.14.1",
|
||||
urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.14.1/rules_docker-v0.14.1.tar.gz"],
|
||||
sha256 = "1698624e878b0607052ae6131aa216d45ebb63871ec497f26c67455b34119c80",
|
||||
strip_prefix = "rules_docker-0.15.0",
|
||||
urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.15.0/rules_docker-v0.15.0.tar.gz"],
|
||||
)
|
||||
|
||||
load("@io_bazel_rules_docker//toolchains/docker:toolchain.bzl", docker_toolchain_configure = "toolchain_configure")
|
||||
|
@ -138,11 +138,11 @@ container_pull(
|
|||
)
|
||||
|
||||
container_pull(
|
||||
name = "gerrit-3.3.0",
|
||||
name = "gerrit-3.3.2",
|
||||
registry = "index.docker.io",
|
||||
repository = "gerritcodereview/gerrit",
|
||||
tag = "3.3.0-ubuntu20",
|
||||
digest = "sha256:c7c43db7be19394a9a5f28a016d0063be2713144dc4bb815ceb698c895bc88d1",
|
||||
tag = "3.3.2-ubuntu20",
|
||||
digest = "sha256:f7fc8b749706f38475f94191117091973914a8f084e69518deff7dbc9c2c557d",
|
||||
)
|
||||
|
||||
# third_party/factorio
|
||||
|
|
|
@ -2,7 +2,7 @@ load("@io_bazel_rules_docker//container:container.bzl", "container_image", "cont
|
|||
|
||||
container_image(
|
||||
name="with_plugins",
|
||||
base="@gerrit-3.3.0//image",
|
||||
base="@gerrit-3.3.2//image",
|
||||
files = [
|
||||
"//devtools/gerrit/gerrit-oauth-provider:gerrit-oauth-provider",
|
||||
"@com_googlesource_gerrit_plugin_owners//owners:owners.jar",
|
||||
|
@ -13,7 +13,7 @@ container_image(
|
|||
directory = "/var/gerrit-plugins",
|
||||
)
|
||||
container_image(
|
||||
name="3.3.0-r7",
|
||||
name="3.3.2-r1",
|
||||
base=":with_plugins",
|
||||
files = [":entrypoint.sh"],
|
||||
directory = "/",
|
||||
|
@ -22,9 +22,9 @@ container_image(
|
|||
|
||||
container_push(
|
||||
name = "push",
|
||||
image = ":3.3.0-r7",
|
||||
image = ":3.3.2-r1",
|
||||
format = "Docker",
|
||||
registry = "registry.k0.hswaw.net",
|
||||
repository = "q3k/gerrit",
|
||||
tag = "3.3.0-r7",
|
||||
tag = "3.3.2-r1",
|
||||
)
|
||||
|
|
|
@ -38,7 +38,7 @@ local kube = import "../../../kube/kube.libsonnet";
|
|||
address: "gerrit@hackerspace.pl",
|
||||
},
|
||||
|
||||
tag: "3.3.0-r7",
|
||||
tag: "3.3.2-r1",
|
||||
image: "registry.k0.hswaw.net/q3k/gerrit:" + cfg.tag,
|
||||
resources: {
|
||||
requests: {
|
||||
|
|
Loading…
Reference in a new issue