From 7b83a6061107092b71dfdb30ee74de4a5bd90e77 Mon Sep 17 00:00:00 2001 From: Michelle Brier Date: Tue, 19 Dec 2023 17:34:37 -0800 Subject: [PATCH 1/6] add ddex as plugin --- discovery-provider/Caddyfile | 7 +++++++ discovery-provider/docker-compose.yml | 13 +++++++++++++ 2 files changed, 20 insertions(+) diff --git a/discovery-provider/Caddyfile b/discovery-provider/Caddyfile index 41068a8ef..6efb0acbd 100644 --- a/discovery-provider/Caddyfile +++ b/discovery-provider/Caddyfile @@ -15,5 +15,12 @@ route /dashboard* { file_server } +route /ddex* { + redir /ddex /ddex/ 308 + uri strip_prefix /ddex + root * /ddex-dist + file_server +} + # defaults to backend:5000 reverse_proxy {$ROOT_HOST:"backend:5000"} diff --git a/discovery-provider/docker-compose.yml b/discovery-provider/docker-compose.yml index e4928a818..a46526072 100644 --- a/discovery-provider/docker-compose.yml +++ b/discovery-provider/docker-compose.yml @@ -387,8 +387,21 @@ services: - discovery-provider-network volumes: - /var/k8s/bolt:/bolt + profiles: + - ddex # plugins + + ddex: + image: audius/ddex:${TAG:-2109fdf8676d9925514f41d186f47ea36fa03643} + container_name: ddex + restart: unless-stopped + entrypoint: "./scripts/docker-entrypoint.sh" + networks: + - discovery-provider-network + volumes: + - ddex-dist:/app/dist + notifications: image: audius/discovery-provider-notifications:${TAG:-d04efbc2f2c58792d1a6bf19ab0747518a27c7c6} container_name: notifications From 2adbdad353b7cf02db9356de5eb90e3de65a254a Mon Sep 17 00:00:00 2001 From: Michelle Brier Date: Tue, 19 Dec 2023 18:12:30 -0800 Subject: [PATCH 2/6] typo --- discovery-provider/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/discovery-provider/docker-compose.yml b/discovery-provider/docker-compose.yml index a46526072..7f9780752 100644 --- a/discovery-provider/docker-compose.yml +++ b/discovery-provider/docker-compose.yml @@ -387,8 +387,6 @@ services: - discovery-provider-network volumes: - /var/k8s/bolt:/bolt - profiles: - - ddex # plugins @@ -401,6 +399,8 @@ services: - discovery-provider-network volumes: - ddex-dist:/app/dist + profiles: + - ddex notifications: image: audius/discovery-provider-notifications:${TAG:-d04efbc2f2c58792d1a6bf19ab0747518a27c7c6} From b91be9c3682a952f99ab0e3f811df538f9fe0e0a Mon Sep 17 00:00:00 2001 From: Michelle Brier Date: Wed, 20 Dec 2023 14:38:41 -0800 Subject: [PATCH 3/6] volume fix --- discovery-provider/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/discovery-provider/docker-compose.yml b/discovery-provider/docker-compose.yml index 7f9780752..3fad35747 100644 --- a/discovery-provider/docker-compose.yml +++ b/discovery-provider/docker-compose.yml @@ -476,3 +476,4 @@ volumes: caddy_data: caddy_config: dashboard-dist: + ddex-dist: From 3f8611cdde740ac37becdd492a3dc8939bcf0791 Mon Sep 17 00:00:00 2001 From: Michelle Brier Date: Wed, 20 Dec 2023 14:42:35 -0800 Subject: [PATCH 4/6] caddy ddex-dist --- discovery-provider/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/discovery-provider/docker-compose.yml b/discovery-provider/docker-compose.yml index 3fad35747..24133514b 100644 --- a/discovery-provider/docker-compose.yml +++ b/discovery-provider/docker-compose.yml @@ -363,6 +363,7 @@ services: - caddy_data:/data - caddy_config:/config - dashboard-dist:/dashboard-dist + - ddex-dist:/ddex-dist dashboard: image: audius/dashboard:${TAG:-d04efbc2f2c58792d1a6bf19ab0747518a27c7c6} From 7f637f4a65abce2130b014efb7fb28851cf2fbc6 Mon Sep 17 00:00:00 2001 From: Michelle Brier Date: Fri, 22 Dec 2023 12:34:34 -0800 Subject: [PATCH 5/6] remove entrypoint --- discovery-provider/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/discovery-provider/docker-compose.yml b/discovery-provider/docker-compose.yml index 24133514b..85c333c30 100644 --- a/discovery-provider/docker-compose.yml +++ b/discovery-provider/docker-compose.yml @@ -395,7 +395,6 @@ services: image: audius/ddex:${TAG:-2109fdf8676d9925514f41d186f47ea36fa03643} container_name: ddex restart: unless-stopped - entrypoint: "./scripts/docker-entrypoint.sh" networks: - discovery-provider-network volumes: From 594404289635b1608d5e6f6d39278e8801132cca Mon Sep 17 00:00:00 2001 From: Michelle Brier Date: Fri, 22 Dec 2023 12:36:14 -0800 Subject: [PATCH 6/6] update tag after rebase --- discovery-provider/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/discovery-provider/docker-compose.yml b/discovery-provider/docker-compose.yml index 85c333c30..62e786d6b 100644 --- a/discovery-provider/docker-compose.yml +++ b/discovery-provider/docker-compose.yml @@ -392,7 +392,7 @@ services: # plugins ddex: - image: audius/ddex:${TAG:-2109fdf8676d9925514f41d186f47ea36fa03643} + image: audius/ddex:${TAG:-d04efbc2f2c58792d1a6bf19ab0747518a27c7c6} container_name: ddex restart: unless-stopped networks: