diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/drone-ci/deploy/runner-docker.hcl | 2 | ||||
| -rw-r--r-- | app/garage-staging/deploy/garage.hcl | 37 |
2 files changed, 33 insertions, 6 deletions
diff --git a/app/drone-ci/deploy/runner-docker.hcl b/app/drone-ci/deploy/runner-docker.hcl index 1f823bf..d7c6ef4 100644 --- a/app/drone-ci/deploy/runner-docker.hcl +++ b/app/drone-ci/deploy/runner-docker.hcl @@ -15,7 +15,7 @@ job "drone-runner" { image = "nixpkgs/nix:nixos-21.05" command = "sh" args = [ - "-c", "cp -rv /nix/{store,var} /mnt/" + "-c", "test -d /mnt/store || cp -rv /nix/{store,var} /mnt/" ] volumes = [ "/var/lib/drone/nix:/mnt", diff --git a/app/garage-staging/deploy/garage.hcl b/app/garage-staging/deploy/garage.hcl index 69c63c5..f103f6f 100644 --- a/app/garage-staging/deploy/garage.hcl +++ b/app/garage-staging/deploy/garage.hcl @@ -11,10 +11,6 @@ job "garage-staging" { } group "garage-staging" { - migrage { - max_parallel = 1 - } - network { port "s3" { static = 3990 } port "rpc" { static = 3991 } @@ -29,11 +25,42 @@ job "garage-staging" { healthy_deadline = "5m" } + # task "repair" { + # lifecycle { + # hook = "prestart" + # sidecar = false + # } + + # driver = "docker" + + # config { + # image = "dxflrs/amd64_garage:v0.7.99-k2v" + # command = "/garage" + # args = [ "offline-repair", "--yes", "object_counters" ] + # network_mode = "host" + # volumes = [ + # "/mnt/storage/garage-staging/data:/data", + # "/mnt/ssd/garage-staging/meta:/meta", + # "secrets/garage.toml:/etc/garage.toml", + # ] + # } + + # template { + # data = file("../config/garage.toml") + # destination = "secrets/garage.toml" + # } + + # resources { + # memory = 2000 + # cpu = 1000 + # } + # } + task "server" { driver = "docker" config { - image = "dxflrs/amd64_garage:v0.7.1-admin-k2v-2" + image = "dxflrs/amd64_garage:v0.7.99-k2v" command = "/garage" args = [ "server" ] network_mode = "host" |