Compare commits

...

2 Commits

Author SHA1 Message Date
2b09c8a6af simpler-filehost: init
Signed-off-by: natto1784 <natto@weirdnatto.in>
2022-11-02 15:52:16 +05:30
b3caa19b55 woodpecker: update files
Signed-off-by: natto1784 <natto@weirdnatto.in>
2022-11-02 15:52:04 +05:30
3 changed files with 47 additions and 9 deletions

View File

@@ -0,0 +1,37 @@
job "simpler-filehost" {
region = "global"
datacenters = [ "nazrin" ]
type = "service"
group "svc" {
count = 1
network {
mode = "bridge"
port "http" {
static = 8888
to = 8000
}
}
task "simpler-filehost" {
driver = "docker"
config {
image = "natto17/simpler-filehost:latest"
ports = ["http"]
volumes = [ "/var/lib/files:/var/files", "/tmp:/tmp" ]
}
env {
USER_URL = "https://f.weirdnatto.in"
ROCKET_LIMITS = "{file=\"512MB\",data-form=\"512MB\"}"
ROCKET_LOG_LEVEL = "debug"
}
resources {
cpu = 500
memory = 256
}
service {
name = "simpler-filehost"
port = "http"
}
}
}
}

View File

@@ -13,6 +13,7 @@ job "woodpecker-agent" {
}
service {
name = "woodpecker-grpc-agent"
connect {
sidecar_service {
proxy {
@@ -30,7 +31,7 @@ job "woodpecker-agent" {
driver = "docker"
config {
image = "woodpeckerci/woodpecker-agent:latest"
image = "woodpeckerci/woodpecker-agent:next"
command = "agent"
volumes = [ "/var/run/docker.sock:/var/run/docker.sock"]
}
@@ -42,11 +43,11 @@ job "woodpecker-agent" {
template {
data = <<EOF
WOODPECKER_LOG_LEVEL=info
WOODPECKER_USERNAME=Marisa
WOODPECKER_AGENT_SECRET={{ with secret "kv/data/woodpecker/agent" }}{{ .Data.data.agent_secret }}{{ end }}
WOODPECKER_MAX_PROCS=2
WOODPECKER_SERVER={{ env "NOMAD_UPSTREAM_ADDR_woodpecker_grpc" }}
WOODPECKER_LOG_LEVEL=trace
WOODPECKER_USERNAME=Marisa
WOODPECKER_AGENT_SECRET={{ with secret "kv/data/woodpecker/agent" }}{{ .Data.data.agent_secret }}{{ end }}
WOODPECKER_MAX_PROCS=2
WOODPECKER_SERVER={{ env "NOMAD_UPSTREAM_ADDR_woodpecker_grpc" }}
EOF
env = true
change_mode = "restart"

View File

@@ -67,10 +67,10 @@ EOF
task "woodpecker" {
driver = "docker"
config {
image = "woodpeckerci/woodpecker-server:latest"
image = "woodpeckerci/woodpecker-server:next"
command = "web"
image_pull_timeout = "30m"
ports = [ "http" ]
ports = [ "http", "grpc" ]
}
resources {
@@ -81,7 +81,7 @@ EOF
template {
data = <<EOF
{{ with secret "kv/data/woodpecker/keys" }}
WOODPECKER_LOG_LEVEL=info
WOODPECKER_LOG_LEVEL=trace
WOODPECKER_HOST={{ .Data.data.external_host }}
WOODPECKER_AGENT_SECRET={{ .Data.data.agent_secret }}
{{end}}