diff --git a/sites/central_storage/deploy/.env b/sites/central_storage/deploy/.env deleted file mode 100644 index b3409ef..0000000 --- a/sites/central_storage/deploy/.env +++ /dev/null @@ -1,25 +0,0 @@ -export APP_NAME=central_storage -export GIT_REPO_ROOT=/mnt/freeleaps/freeleaps-service-hub -export APP_PARENT_FOLDER=apps -export SERVICE_API_ACCESS_HOST=0.0.0.0 -export SERVICE_API_ACCESS_PORT=8005 -export CONTAINER_APP_ROOT=/app -export AZURE_STORAGE_DOCUMENT_API_KEY=xbiFtFeQ6v5dozgVM99fZ9huUomL7QcLu6s0y8zYHtIXZ8XdneKDMcg4liQr/9oNlVoRFcZhWjLY+ASt9cjICQ== -export AZURE_STORAGE_DOCUMENT_API_ENDPOINT="https://freeleaps1document.blob.core.windows.net/" -export LOG_BASE_PATH=$CONTAINER_APP_ROOT/log/$APP_NAME -export BACKEND_LOG_FILE_NAME=$APP_NAME -export APPLICATION_ACTIVITY_LOG=$APP_NAME-activity -export MONGODB_NAME=freeleaps2 -export MONGODB_PORT=27017 -export CODEBASE_ROOT=/mnt/freeleaps/freeleaps-service-hub/apps/central_storage -export WORKING_DIR=/mnt/freeleaps/freeleaps-service-hub/sites/central_storage/deploy -#!/bin/bash -export VENV_DIR=venv_t -export VENV_ACTIVATE=venv_t/bin/activate -export DOCKER_HOME=/var/lib/docker -export DOCKER_APP_HOME=$DOCKER_HOME/app -export DOCKER_BACKEND_HOME=$DOCKER_APP_HOME/$APP_NAME -export DOCKER_BACKEND_LOG_HOME=$DOCKER_BACKEND_HOME/log -export MONGODB_URI=mongodb://freeleaps2-mongodb:27017/ -export FREELEAPS_ENV=dev - diff --git a/sites/central_storage/deploy/deploy.sh b/sites/central_storage/deploy/deploy.sh index 8885792..32de958 100755 --- a/sites/central_storage/deploy/deploy.sh +++ b/sites/central_storage/deploy/deploy.sh @@ -81,8 +81,8 @@ sudo docker compose -p $PROJECT_NAME -f $DOCKER_COMPOSE_YAML --profile $TARGET_E echo 'You can use "sudo docker compose logs -f" to check the output of the containers' sudo docker ps -a -#rm $WORKING_DIR/.env -#rm $DOCKER_COMPOSE_YAML +rm $WORKING_DIR/.env +rm $DOCKER_COMPOSE_YAML while [[ "$DW_PUSHD_COUNTER" -gt 0 ]]; do DW_PUSHD_COUNTER=$((DW_PUSHD_COUNTER - 1)) diff --git a/sites/central_storage/deploy/docker-compose-central_storage.yaml b/sites/central_storage/deploy/docker-compose-central_storage.yaml deleted file mode 100755 index 5a0e61d..0000000 --- a/sites/central_storage/deploy/docker-compose-central_storage.yaml +++ /dev/null @@ -1,37 +0,0 @@ -services: - central_storage: - container_name: $APP_NAME - build: - context: ${CODEBASE_ROOT} - args: - CONTAINER_APP_ROOT: ${CONTAINER_APP_ROOT} - profiles: [prod,alpha,dev] - restart: always - environment: - - APP_NAME=${APP_NAME} - - MONGODB_NAME=${MONGODB_NAME} - - MONGODB_PORT=${MONGODB_PORT} - - MONGODB_URI=${MONGODB_URI} - - SERVICE_API_ACCESS_HOST=${SERVICE_API_ACCESS_HOST} - - SERVICE_API_ACCESS_PORT=${SERVICE_API_ACCESS_PORT} - - AZURE_STORAGE_DOCUMENT_API_KEY=${AZURE_STORAGE_DOCUMENT_API_KEY} - - AZURE_STORAGE_DOCUMENT_API_ENDPOINT=${AZURE_STORAGE_DOCUMENT_API_ENDPOINT} - - LOG_BASE_PATH=${LOG_BASE_PATH} - - BACKEND_LOG_FILE_NAME=${BACKEND_LOG_FILE_NAME} - - APPLICATION_ACTIVITY_LOG=${APPLICATION_ACTIVITY_LOG} - ports: - - ${SERVICE_API_ACCESS_PORT}:${SERVICE_API_ACCESS_PORT} - command: - - /bin/sh - - -c - - | - uvicorn webapi.main:app --reload --port=${SERVICE_API_ACCESS_PORT} --host=${SERVICE_API_ACCESS_HOST} - networks: - - devbox_freeleaps2-network - volumes: - - type: bind - source: $DOCKER_BACKEND_LOG_HOME - target: $LOG_BASE_PATH -networks: - devbox_freeleaps2-network: - external: true \ No newline at end of file