From 6e9e9ca0bd8052993572737a843e96b7de0c39ff Mon Sep 17 00:00:00 2001 From: Paige Williams Date: Wed, 24 Jun 2026 14:57:30 -0700 Subject: [PATCH 1/4] use local media directory; check for all containers for success; name proxy container --- docker/docker-compose.prod.local.yaml | 6 +++--- scripts/Linux/install-docker-env.sh | 9 +++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/docker/docker-compose.prod.local.yaml b/docker/docker-compose.prod.local.yaml index 8bc64b8c..2a3f9358 100644 --- a/docker/docker-compose.prod.local.yaml +++ b/docker/docker-compose.prod.local.yaml @@ -21,8 +21,9 @@ services: condition: service_started volumes: - static_volume:/usr/src/app/static - - media_volume:/usr/src/app/media + - ../../media:/usr/src/app/media proxy: + container_name: tekdb_proxy build: context: ../proxy/ dockerfile: ../proxy/Dockerfile.local @@ -33,7 +34,7 @@ services: - "80:8080" volumes: - static_volume:/vol/static/static:ro - - media_volume:/vol/static/media:ro + - ../../media:/vol/static/media:ro redis: extends: file: common.yaml @@ -56,4 +57,3 @@ services: volumes: tekdb_db_data: static_volume: - media_volume: diff --git a/scripts/Linux/install-docker-env.sh b/scripts/Linux/install-docker-env.sh index 337d70ca..2e78e723 100644 --- a/scripts/Linux/install-docker-env.sh +++ b/scripts/Linux/install-docker-env.sh @@ -52,9 +52,14 @@ sudo usermod -aG docker ubuntu echo "Installing git..." sudo apt install git -y -echo "Creating TEKDB directory and cloning repository..." +echo "Creating TEKDB directory" mkdir tekdb cd tekdb + +echo "Creating a media directory for TEKDB..." +mkdir media + +echo "Cloning the TEKDB repository..." git clone https://github.com/Ecotrust/TEKDB.git # TODO: change to the main branch once the develop branch is merged into main!! @@ -73,7 +78,7 @@ echo "Starting the Docker containers..." docker compose --env-file docker/.env.prod -f docker/docker-compose.prod.local.yaml up -d echo "Verifying that the containers are running..." -if [ "$(docker container inspect -f '{{.State.Status}}' "tekdb_web" 2>/dev/null)" = "running" ]; then +if [ "$(docker container inspect -f '{{.State.Status}}' "tekdb_web" 2>/dev/null)" = "running" ] && [ "$(docker container inspect -f '{{.State.Status}}' "db" 2>/dev/null)" = "running" ] && [ "$(docker container inspect -f '{{.State.Status}}' "tekdb_proxy" 2>/dev/null)" = "running" ]; then; echo "TEKDB containers are running successfully." else echo "Failed to start TEKDB containers. Please check the Docker logs for more information." From 01d5ce2fe918e82ba15cd31b2eab52f659f7e311 Mon Sep 17 00:00:00 2001 From: Paige Williams Date: Wed, 24 Jun 2026 15:16:53 -0700 Subject: [PATCH 2/4] build the proxy image in install-docker-env.sh --- scripts/Linux/install-docker-env.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/Linux/install-docker-env.sh b/scripts/Linux/install-docker-env.sh index cc077f61..b272215d 100644 --- a/scripts/Linux/install-docker-env.sh +++ b/scripts/Linux/install-docker-env.sh @@ -73,6 +73,9 @@ mv $ENV_FILE docker/.env.prod echo "Pulling the latest Docker image..." docker pull ghcr.io/ecotrust/tekdb/web:latest +echo "Building the proxy image..." +docker build -t tekdb_proxy -f proxy/Dockerfile.local proxy/ + echo "Starting the Docker containers..." docker compose --env-file docker/.env.prod -f docker/docker-compose.prod.local.yaml up -d From b99f3d72b816afb4979acc7dcf09ab9409a6d65a Mon Sep 17 00:00:00 2001 From: Paige Williams Date: Wed, 24 Jun 2026 16:11:16 -0700 Subject: [PATCH 3/4] adjust install-docker-env script --- scripts/Linux/install-docker-env.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/Linux/install-docker-env.sh b/scripts/Linux/install-docker-env.sh index b272215d..431f0fc5 100644 --- a/scripts/Linux/install-docker-env.sh +++ b/scripts/Linux/install-docker-env.sh @@ -53,11 +53,11 @@ echo "Installing git..." sudo apt install git -y echo "Creating TEKDB directory" -mkdir tekdb +mkdir -p tekdb cd tekdb echo "Creating a media directory for TEKDB..." -mkdir media +mkdir -p media echo "Cloning the TEKDB repository..." git clone https://github.com/Ecotrust/TEKDB.git @@ -80,7 +80,7 @@ echo "Starting the Docker containers..." docker compose --env-file docker/.env.prod -f docker/docker-compose.prod.local.yaml up -d echo "Verifying that the containers are running..." -if [ "$(docker container inspect -f '{{.State.Status}}' "tekdb_web" 2>/dev/null)" = "running" ] && [ "$(docker container inspect -f '{{.State.Status}}' "db" 2>/dev/null)" = "running" ] && [ "$(docker container inspect -f '{{.State.Status}}' "tekdb_proxy" 2>/dev/null)" = "running" ]; then; +if [ "$(docker container inspect -f '{{.State.Status}}' "tekdb_web" 2>/dev/null)" = "running" ] && [ "$(docker container inspect -f '{{.State.Status}}' "db" 2>/dev/null)" = "running" ] && [ "$(docker container inspect -f '{{.State.Status}}' "tekdb_proxy" 2>/dev/null)" = "running" ]; then echo "TEKDB containers are running successfully." else echo "Failed to start TEKDB containers. Please check the Docker logs for more information." From 1fdbae41d1a27c65fd7ce89a7eb71049347703ac Mon Sep 17 00:00:00 2001 From: Paige Williams Date: Wed, 24 Jun 2026 16:20:01 -0700 Subject: [PATCH 4/4] use docker compose build proxy instead of docker build --- scripts/Linux/install-docker-env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Linux/install-docker-env.sh b/scripts/Linux/install-docker-env.sh index 431f0fc5..947183e5 100644 --- a/scripts/Linux/install-docker-env.sh +++ b/scripts/Linux/install-docker-env.sh @@ -74,7 +74,7 @@ echo "Pulling the latest Docker image..." docker pull ghcr.io/ecotrust/tekdb/web:latest echo "Building the proxy image..." -docker build -t tekdb_proxy -f proxy/Dockerfile.local proxy/ +docker compose --env-file docker/.env.prod -f docker/docker-compose.prod.local.yaml build proxy echo "Starting the Docker containers..." docker compose --env-file docker/.env.prod -f docker/docker-compose.prod.local.yaml up -d