diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 662bc02..ebb6cfc 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -1,9 +1,9 @@ name: DEV - Build and Deploy on: - push: + pull_request: branches: - - development + - main workflow_dispatch: jobs: diff --git a/operations/deploy-dev.hcl b/operations/deploy-dev.hcl index 67a8ea2..1c90e0f 100644 --- a/operations/deploy-dev.hcl +++ b/operations/deploy-dev.hcl @@ -66,7 +66,6 @@ job "sbws-dev" { config { image = "ghcr.io/anyone-protocol/ator-protocol-dev:latest" - force_pull = true volumes = [ "local/anonrc:/etc/anon/anonrc" ] @@ -129,7 +128,6 @@ ORPort {{ env `NOMAD_PORT_orport` }} config { image = "ghcr.io/anyone-protocol/sbws-scanner:DEPLOY_TAG" - force_pull = true volumes = [ "local/.sbws.ini:/root/.sbws.ini:ro" ] @@ -228,7 +226,7 @@ log_format default '[$time_iso8601] $remote_addr - $remote_user $request $status server { root /data; - access_log /dev/stdout default; + access_log /dev/stdout default; error_log /dev/stderr warn; autoindex on; listen 0.0.0.0:{{ env `NOMAD_PORT_http_port` }}; diff --git a/operations/deploy-live.hcl b/operations/deploy-live.hcl index c8b2e6d..718b4d6 100644 --- a/operations/deploy-live.hcl +++ b/operations/deploy-live.hcl @@ -72,7 +72,6 @@ job "sbws-live" { config { image = "svforte/anon:v0.4.9.0" - force_pull = true volumes = [ "local/anonrc:/etc/anon/anonrc" ] @@ -134,7 +133,6 @@ ORPort {{ env `NOMAD_PORT_orport` }} config { image = "ghcr.io/anyone-protocol/sbws-scanner:DEPLOY_TAG" - force_pull = true volumes = [ "local/.sbws.ini:/root/.sbws.ini:ro" ] @@ -147,7 +145,7 @@ ORPort {{ env `NOMAD_PORT_orport` }} resources { cpu = 1024 - memory = 2560 + memory = 3072 } template { @@ -232,7 +230,7 @@ external_control_port = {{ env `NOMAD_PORT_control_port` }} log_format default '[$time_iso8601] $remote_addr - $remote_user $request $status $body_bytes_sent $http_referer $http_user_agent $http_x_forwarded_for'; server { root /data; - access_log /dev/stdout default; + access_log /dev/stdout default; error_log /dev/stderr warn; autoindex on; listen 0.0.0.0:{{ env `NOMAD_PORT_http_port` }}; diff --git a/operations/deploy-stage.hcl b/operations/deploy-stage.hcl index f7502b5..4f6b6e2 100644 --- a/operations/deploy-stage.hcl +++ b/operations/deploy-stage.hcl @@ -60,7 +60,6 @@ job "sbws-stage" { config { image = "ghcr.io/anyone-protocol/ator-protocol-stage:latest" - force_pull = true volumes = [ "local/anonrc:/etc/anon/anonrc" ] @@ -123,7 +122,6 @@ ORPort {{ env `NOMAD_PORT_orport` }} config { image = "ghcr.io/anyone-protocol/sbws-scanner:DEPLOY_TAG" - force_pull = true volumes = [ "local/.sbws.ini:/root/.sbws.ini:ro" ] @@ -287,7 +285,6 @@ external_control_port = {{ env `NOMAD_PORT_control_port` }} config { image = "ghcr.io/anyone-protocol/ator-protocol-stage:latest" - force_pull = true volumes = [ "local/anonrc:/etc/anon/anonrc" ] @@ -350,7 +347,6 @@ ORPort {{ env `NOMAD_PORT_orport` }} config { image = "ghcr.io/anyone-protocol/sbws-scanner:DEPLOY_TAG" - force_pull = true volumes = [ "local/.sbws.ini:/root/.sbws.ini:ro" ] @@ -514,7 +510,6 @@ external_control_port = {{ env `NOMAD_PORT_control_port` }} config { image = "ghcr.io/anyone-protocol/ator-protocol-stage:latest" - force_pull = true volumes = [ "local/anonrc:/etc/anon/anonrc" ] @@ -577,7 +572,6 @@ ORPort {{ env `NOMAD_PORT_orport` }} config { image = "ghcr.io/anyone-protocol/sbws-scanner:DEPLOY_TAG" - force_pull = true volumes = [ "local/.sbws.ini:/root/.sbws.ini:ro" ] @@ -676,7 +670,7 @@ external_control_port = {{ env `NOMAD_PORT_control_port` }} log_format default '[$time_iso8601] $remote_addr - $remote_user $request $status $body_bytes_sent $http_referer $http_user_agent $http_x_forwarded_for'; server { root /data; - access_log /dev/stdout default; + access_log /dev/stdout default; error_log /dev/stderr warn; autoindex on; listen 0.0.0.0:{{ env `NOMAD_PORT_http_port` }};