From 429df932bca653bba061958325513084e8f1dcb8 Mon Sep 17 00:00:00 2001 From: David Ludwig Date: Sun, 4 Apr 2021 16:28:41 -0500 Subject: [PATCH] Add Torrent Web UI. Fix minor mistakes in Docker files --- .gitmodules | 5 ++++- docker-compose.dev.yml | 14 ++++++++++++-- docker-compose.yml | 22 ++++++++++++++++++++-- torrent-webui | 1 + 4 files changed, 37 insertions(+), 5 deletions(-) create mode 160000 torrent-webui diff --git a/.gitmodules b/.gitmodules index 4195774..04c0dcc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "torrent-client"] path = torrent-client - url = ssh://git@git.dlii.tech:222/Autoplex/autoplex.git + url = ssh://git@git.dlii.tech:222/Autoplex/torrent-client.git +[submodule "torrent-webui"] + path = torrent-webui + url = ssh://git@git.dlii.tech:222/Autoplex/torrent-webui.git diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index fa33e01..c4b5bf4 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,14 +1,24 @@ version: "3.9" services: - torrent: + torrent_webui: + build: + target: base + ports: + - 3000:3000 + volumes: + - ./torrent-webui:/app + entrypoint: "/bin/sh" + tty: true + + torrent_client: build: target: base ports: - 9229:9229 volumes: - ./torrent-client:/app - ulimits: + # ulimits: # core: # hard: -1 # soft: -1 diff --git a/docker-compose.yml b/docker-compose.yml index 269528d..0710b7d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,23 @@ version: "3.9" services: - torrent: + torrent_webui: + build: + context: ./torrent-webui + depends_on: + - "database" + - "torrent_client" + env_file: + - ./torrent-webui/.env + links: + - "database" + - "torrent_client" + ports: + - 3100:3100 + secrets: + - mysql_root_password + + torrent_client: build: context: ./torrent-client depends_on: @@ -10,6 +26,8 @@ services: - ./torrent-client/.env links: - "database" + # ports: + # - 3000:3000 secrets: - mysql_root_password @@ -31,7 +49,7 @@ services: secrets: mysql_root_password: - file: ./.passwords/mysql_root_password + file: ./.secrets/mysql_root_password volumes: autoplex: diff --git a/torrent-webui b/torrent-webui new file mode 160000 index 0000000..a3fdd2b --- /dev/null +++ b/torrent-webui @@ -0,0 +1 @@ +Subproject commit a3fdd2bf53840c9a7e5a9c6a9c710bedef83a8e5