From 5d5b954ffc2ca1a16607a82bb1b4cfec815872c7 Mon Sep 17 00:00:00 2001 From: David Ludwig Date: Mon, 12 Apr 2021 22:27:39 -0500 Subject: [PATCH] Add request module. Update torrent client --- .gitmodules | 3 +++ database/init/01-databases.sql | 1 + docker-compose.dev.yml | 10 ++++++++++ docker-compose.yml | 18 ++++++++++++++++++ request | 1 + torrent-client | 2 +- torrent-webui | 2 +- 7 files changed, 35 insertions(+), 2 deletions(-) create mode 160000 request diff --git a/.gitmodules b/.gitmodules index 04c0dcc..5672fe2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "torrent-webui"] path = torrent-webui url = ssh://git@git.dlii.tech:222/Autoplex/torrent-webui.git +[submodule "request"] + path = request + url = ssh://git@git.dlii.tech:222/Autoplex/request.git diff --git a/database/init/01-databases.sql b/database/init/01-databases.sql index bdc376b..efd5890 100644 --- a/database/init/01-databases.sql +++ b/database/init/01-databases.sql @@ -1 +1,2 @@ +CREATE DATABASE IF NOT EXISTS `autoplex_request`; CREATE DATABASE IF NOT EXISTS `autoplex_torrent`; diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index c4b5bf4..c774562 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,6 +1,16 @@ version: "3.9" services: + request: + build: + target: base + ports: + - 3001:3001 + volumes: + - ./request:/app + entrypoint: "/bin/sh" + tty: true + torrent_webui: build: target: base diff --git a/docker-compose.yml b/docker-compose.yml index d8aa05c..3fbc8a2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,24 @@ version: "3.9" services: + request: + build: + context: ./request + depends_on: + - "database" + - "torrent_client" + env_file: + - ./request/.env + links: + - "database" + - "torrent_client" + ports: + - 3200:3200 + secrets: + - mysql_root_password + volumes: + - tmp:/tmp + torrent_webui: build: context: ./torrent-webui diff --git a/request b/request new file mode 160000 index 0000000..560ffe8 --- /dev/null +++ b/request @@ -0,0 +1 @@ +Subproject commit 560ffe89f3534cc3bc47e19644307e76b8822b51 diff --git a/torrent-client b/torrent-client index beed0eb..eaf2fa3 160000 --- a/torrent-client +++ b/torrent-client @@ -1 +1 @@ -Subproject commit beed0eb7ac49f4d63bb1e35cc7ca3fa4dc777d5a +Subproject commit eaf2fa3e9e70beec7475ef5724a55f9a1ba174d8 diff --git a/torrent-webui b/torrent-webui index ba75b0f..a4e0f1f 160000 --- a/torrent-webui +++ b/torrent-webui @@ -1 +1 @@ -Subproject commit ba75b0ff45d47062ddb4308e7459a83008093c80 +Subproject commit a4e0f1fb6c7f57b0bcf0ced049df5825bee8fae5