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 990bcb18..947183e5 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..." -mkdir tekdb +echo "Creating TEKDB directory" +mkdir -p tekdb cd tekdb + +echo "Creating a media directory for TEKDB..." +mkdir -p media + +echo "Cloning the TEKDB repository..." git clone https://github.com/Ecotrust/TEKDB.git echo "Checking out the main branch..." @@ -68,11 +73,14 @@ 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 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 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."