diff --git a/build/docker-compose.yml b/build/docker-compose.yml index 607ef1c..30425c5 100644 --- a/build/docker-compose.yml +++ b/build/docker-compose.yml @@ -97,6 +97,7 @@ services: networks: redisnet: ipv4_address: 10.33.33.4 + restart: always bconsul: image: hashicorp/consul:1.15.4 @@ -186,6 +187,7 @@ services: bouldernet: ipv4_address: 10.77.77.9 command: "gunicorn -w 1 -k uvicorn.workers.UvicornWorker -b 0.0.0.0:80 pkilint.rest:app" + restart: always volumes: dbdata: diff --git a/build/tmp.patch b/build/tmp.patch index 3a4c4b3..67d61a0 100644 --- a/build/tmp.patch +++ b/build/tmp.patch @@ -1,5 +1,5 @@ diff --git a/docker-compose.yml b/docker-compose.yml -index d90c629af..607ef1c7d 100644 +index 2f7f62688..30425c570 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: @@ -37,7 +37,7 @@ index d90c629af..607ef1c7d 100644 command: redis-server /opt/boulder/labca/redis-ratelimits.config networks: redisnet: -@@ -103,35 +103,37 @@ services: +@@ -104,35 +104,37 @@ services: depends_on: - control volumes: @@ -86,7 +86,7 @@ index d90c629af..607ef1c7d 100644 logging: driver: "json-file" options: -@@ -148,30 +150,28 @@ services: +@@ -149,30 +151,28 @@ services: - 80:80 - 443:443 volumes: @@ -131,7 +131,7 @@ index d90c629af..607ef1c7d 100644 expose: - 3030 environment: -@@ -189,6 +189,15 @@ services: +@@ -191,6 +191,15 @@ services: volumes: dbdata: diff --git a/patches/docker-compose.patch b/patches/docker-compose.patch index a55e494..97226a5 100644 --- a/patches/docker-compose.patch +++ b/patches/docker-compose.patch @@ -1,5 +1,5 @@ diff --git a/docker-compose.yml b/docker-compose.yml -index 2dfa6c278..d90c629af 100644 +index 2dfa6c278..2f7f62688 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,4 @@ @@ -72,7 +72,7 @@ index 2dfa6c278..d90c629af 100644 networks: bouldernet: aliases: -@@ -90,82 +83,112 @@ services: +@@ -90,82 +83,114 @@ services: # small. command: mysqld --bind-address=0.0.0.0 --slow-query-log --log-output=TABLE --log-queries-not-using-indexes=ON logging: @@ -127,7 +127,7 @@ index 2dfa6c278..d90c629af 100644 networks: redisnet: ipv4_address: 10.33.33.4 - +- - bredis_4: - image: redis:6.2.7 - volumes: @@ -136,7 +136,8 @@ index 2dfa6c278..d90c629af 100644 - networks: - redisnet: - ipv4_address: 10.33.33.5 -- ++ restart: always + bconsul: image: hashicorp/consul:1.15.4 + depends_on: @@ -232,6 +233,7 @@ index 2dfa6c278..d90c629af 100644 ipv4_address: 10.77.77.9 - command: "gunicorn -w 8 -k uvicorn.workers.UvicornWorker -b 0.0.0.0:80 pkilint.rest:app" + command: "gunicorn -w 1 -k uvicorn.workers.UvicornWorker -b 0.0.0.0:80 pkilint.rest:app" ++ restart: always + +volumes: + dbdata: