diff --git a/clone-all.sh b/clone-all.sh index 6109822..d21a72c 100755 --- a/clone-all.sh +++ b/clone-all.sh @@ -1,7 +1,7 @@ # This script clones all relevant repositories into respective folders in the current working directory. git_url="https://git.trinkey.com/t" -declare -a repositories=("common" "auth" "message") +declare -a repositories=("common" "auth" "message", "blog") for service in "${repositories[@]}" do diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 19a5f04..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,26 +0,0 @@ -version: "3.8" - -services: - common: - build: ./common - ports: - - "8888:8888" - restart: always - auth: - build: ./auth - depends_on: - - common - ports: - - "8800:8800" - restart: always - volumes: - - /home/trinkey/test/tsuite/:/home/trinkey/test/tsuite/ - message: - build: ./message - depends_on: - - auth - ports: - - "8001:8001" - restart: always - volumes: - - /home/trinkey/test/tsuite/:/home/trinkey/test/tsuite/ diff --git a/setup-docker.py b/setup-docker.py index 3101f9d..60b0fbf 100644 --- a/setup-docker.py +++ b/setup-docker.py @@ -4,23 +4,26 @@ from pathlib import Path print("Docker configuration\n" + ("-" * 20)) print("You may need to run this with sudo") -possible_services = ["message"] +possible_services = ["message", "blog"] required_services = ["common", "auth"] databases = { "auth": "auth.sqlite3", - "message": "message.sqlite3" + "message": "message.sqlite3", + "blog": "blog.sqlite3" } defaults = { "common": { "port": "8888", "public_url": "http://localhost:8888" }, "auth": { "port": "8000", "public_url": "http://localhost:8000" }, - "message": { "port": "8001", "public_url": "http://localhost:8001" } + "message": { "port": "8001", "public_url": "http://localhost:8001" }, + "blog": { "port": "8002", "public_url": "http://localhost:8002" } } depends = { "auth": "common", "message": "auth" + "blog": "auth" } enabled_applications = {} diff --git a/update-all.sh b/update-all.sh index f20aaf5..73c7330 100755 --- a/update-all.sh +++ b/update-all.sh @@ -1,7 +1,7 @@ # This script pulls new changes to all relevant repositories into respective folders in the current working directory. git_url="https://git.trinkey.com/t" -declare -a repositories=("common" "auth" "message") +declare -a repositories=("common" "auth" "message", "blog") for service in "${repositories[@]}" do