From 4383c139637025917645300cda8047f32926aa99 Mon Sep 17 00:00:00 2001 From: Chris Lovering Date: Tue, 25 Jan 2022 21:51:56 +0000 Subject: Add missing restart-policy to metricity container --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'docker-compose.yml') diff --git a/docker-compose.yml b/docker-compose.yml index 869d9acb6..ce78f65aa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,6 +38,7 @@ services: metricity: << : *logging + << : *restart_policy restart: on-failure # USE_METRICITY=false will stop the container, so this ensures it only restarts on error depends_on: postgres: -- cgit v1.2.3 From 3ad7cd9a5880853771e6af1f050bd5eb251b9b88 Mon Sep 17 00:00:00 2001 From: Chris Lovering Date: Wed, 13 Jul 2022 18:59:38 +0100 Subject: Add required config and constants for snekbox 3.11 --- bot/constants.py | 1 + config-default.yml | 1 + docker-compose.yml | 12 ++++++++++++ 3 files changed, 14 insertions(+) (limited to 'docker-compose.yml') diff --git a/bot/constants.py b/bot/constants.py index c39f9d2b8..db98e6f47 100644 --- a/bot/constants.py +++ b/bot/constants.py @@ -540,6 +540,7 @@ class URLs(metaclass=YAMLGetter): # Snekbox endpoints snekbox_eval_api: str + snekbox_311_eval_api: str # Discord API endpoints discord_api: str diff --git a/config-default.yml b/config-default.yml index 91945e2b8..a12b680e1 100644 --- a/config-default.yml +++ b/config-default.yml @@ -379,6 +379,7 @@ urls: # Snekbox snekbox_eval_api: !ENV ["SNEKBOX_EVAL_API", "http://snekbox.default.svc.cluster.local/eval"] + snekbox_311_eval_api: !ENV ["SNEKBOX_311_EVAL_API", "http://snekbox-311.default.svc.cluster.local/eval"] # Discord API URLs discord_api: &DISCORD_API "https://discordapp.com/api/v7/" diff --git a/docker-compose.yml b/docker-compose.yml index ce78f65aa..f0d3f934f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -62,6 +62,18 @@ services: - "127.0.0.1:8060:8060" privileged: true + snekbox-311: + << : *logging + << : *restart_policy + image: ghcr.io/python-discord/snekbox:3.11-dev + init: true + ipc: none + ports: + - "127.0.0.1:8065:8060" + privileged: true + profiles: + - "3.11" + web: << : *logging << : *restart_policy -- cgit v1.2.3 From 76caa093b9943549de6b05d8610cd1c10da2717d Mon Sep 17 00:00:00 2001 From: Chris Lovering Date: Sun, 17 Jul 2022 13:17:45 +0100 Subject: Start 3.11 snekbox container by default Since snekbox uses 3.11 by default, it makes sense for this one to be started by default, and the 3.10 container to be opt-in. --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docker-compose.yml') diff --git a/docker-compose.yml b/docker-compose.yml index f0d3f934f..f7759566b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -61,6 +61,8 @@ services: ports: - "127.0.0.1:8060:8060" privileged: true + profiles: + - "3.10" snekbox-311: << : *logging @@ -71,8 +73,6 @@ services: ports: - "127.0.0.1:8065:8060" privileged: true - profiles: - - "3.11" web: << : *logging -- cgit v1.2.3 From be64bb58640183025a13e7a502382bf4b14f79a5 Mon Sep 17 00:00:00 2001 From: Chris Lovering Date: Sat, 23 Jul 2022 22:42:43 +0100 Subject: Update the docker-compose snekbox dep for bot The bot service was still configured to depend on the snekbox service, even though this service is now optional, in favour of the snekbox-311 service. --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker-compose.yml') diff --git a/docker-compose.yml b/docker-compose.yml index f7759566b..be7370d6b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -108,7 +108,7 @@ services: depends_on: - web - redis - - snekbox + - snekbox-311 env_file: - .env environment: -- cgit v1.2.3