Compare commits

...

3 Commits

3 changed files with 14 additions and 8 deletions

View File

@ -36,7 +36,7 @@ DRONE_S3_BUCKET={{ key "secrets/drone-ci/s3_bucket" }}
DRONE_S3_ENDPOINT=https://garage.deuxfleurs.fr DRONE_S3_ENDPOINT=https://garage.deuxfleurs.fr
DRONE_S3_PATH_STYLE=true DRONE_S3_PATH_STYLE=true
DRONE_DATABASE_DRIVER=postgres DRONE_DATABASE_DRIVER=postgres
DRONE_DATABASE_DATASOURCE=postgres://{{ key "secrets/drone-ci/db_user" }}:{{ key "secrets/drone-ci/db_pass" }}@psql-proxy.service.2.cluster.deuxfleurs.fr:5432/postgres?sslmode=disable DRONE_DATABASE_DATASOURCE=postgres://{{ key "secrets/drone-ci/db_user" }}:{{ key "secrets/drone-ci/db_pass" }}@psql-proxy.service.2.cluster.deuxfleurs.fr:5432/drone?sslmode=disable
DRONE_USER_CREATE=username:lx-admin,admin:true DRONE_USER_CREATE=username:lx-admin,admin:true
DRONE_LOGS_TEXT=true DRONE_LOGS_TEXT=true
DRONE_LOGS_PRETTY=true DRONE_LOGS_PRETTY=true

View File

@ -15,11 +15,17 @@ job "garage" {
port "web" { static = 3902 } port "web" { static = 3902 }
} }
update {
max_parallel = 1
min_healthy_time = "30s"
healthy_deadline = "10m"
}
task "server" { task "server" {
driver = "docker" driver = "docker"
config { config {
advertise_ipv6_address = true advertise_ipv6_address = true
image = "lxpz/garage_amd64:v0.1.1b" image = "lxpz/garage_amd64:v0.1.1d"
network_mode = "host" network_mode = "host"
volumes = [ volumes = [
"/mnt/storage/garage/data:/garage/data", "/mnt/storage/garage/data:/garage/data",

View File

@ -114,18 +114,18 @@ job "postgres" {
tags = ["sql"] tags = ["sql"]
port = "psql_port" port = "psql_port"
address_mode = "host" address_mode = "host"
name = "keeper" name = "psql-keeper"
check { check {
type = "tcp" type = "tcp"
port = "psql_port" port = "psql_port"
interval = "60s" interval = "60s"
timeout = "5s" timeout = "5s"
check_restart { // check_restart {
limit = 3 // limit = 3
grace = "60m" // grace = "60m"
ignore_warnings = false // ignore_warnings = false
} // }
} }
} }
} }