From 0590f12d3cac68371b01be198b302c8fee43a7e6 Mon Sep 17 00:00:00 2001 From: parvathy00 <102500787+parvathy00@users.noreply.github.com> Date: Fri, 14 Jul 2023 14:56:11 +0530 Subject: [PATCH] Parvathy | Update docker image tags to latest (#52) * Parvathy | Update docker image tags to latest * Parvathy | Fix. crater app url * Parvathy, Rahul | Add. Create .env.dev * Parvathy, Rahul | Refactor. Downgrade image tags to 1.0.0 * Parvathy, Rahul | Fix. Docker compose envrionment file path * Fix. Update workflow * Fix. Update workflow * Parvathy | Add. Create .env.dev for bahmni-standard * Parvathy | Fix. Docker compose environment file path for bahmni-standard * [Parvathy, Rahul] | BAH-3068 | Add. Env File Path To Docker Compose Command --------- Co-authored-by: Rahul Ramesh <121226043+rahu1ramesh@users.noreply.github.com> --- .github/workflows/bahmni_lite_docker_env.yaml | 6 +- .../workflows/bahmni_standard_docker_env.yaml | 6 +- bahmni-lite/.env.dev | 141 ++++++++++++++++ bahmni-standard/.env.dev | 156 ++++++++++++++++++ 4 files changed, 303 insertions(+), 6 deletions(-) create mode 100644 bahmni-lite/.env.dev create mode 100644 bahmni-standard/.env.dev diff --git a/.github/workflows/bahmni_lite_docker_env.yaml b/.github/workflows/bahmni_lite_docker_env.yaml index 538543c..f5b72b9 100644 --- a/.github/workflows/bahmni_lite_docker_env.yaml +++ b/.github/workflows/bahmni_lite_docker_env.yaml @@ -42,9 +42,9 @@ jobs: - name: Create/Update Containers run: | if [ "$UPDATE_BAHMNI_OPTION" == "update_without_removing_volumes" ]; then - command="docker compose up -d" + command="docker compose --env-file .env.dev up -d" elif [ "$UPDATE_BAHMNI_OPTION" == "update_and_remove_volumes" ]; then - command="docker compose down -v && docker compose up -d" + command="docker compose --env-file .env.dev down -v && docker compose --env-file .env.dev up -d" fi INSTANCE_ID=$(aws ec2 describe-instances --filters "Name=tag:Name,Values=bahmni-lite-docker" "Name=instance-state-name,Values=running" --query "Reservations[].Instances[].InstanceId" --output text) @@ -60,7 +60,7 @@ jobs: "commands": [ ". /home/ubuntu/.bash_profile", "git pull -r", - "docker compose pull", + "docker compose --env-file .env.dev pull", "'"$command"'", "docker image prune -f" ], diff --git a/.github/workflows/bahmni_standard_docker_env.yaml b/.github/workflows/bahmni_standard_docker_env.yaml index 70c282b..348e06f 100644 --- a/.github/workflows/bahmni_standard_docker_env.yaml +++ b/.github/workflows/bahmni_standard_docker_env.yaml @@ -46,9 +46,9 @@ jobs: - name: Create/Update Containers run: | if [ "$UPDATE_BAHMNI_OPTION" == "update_without_removing_volumes" ]; then - command="docker compose up -d" + command="docker compose --env-file .env.dev up -d" elif [ "$UPDATE_BAHMNI_OPTION" == "update_and_remove_volumes" ]; then - command="docker compose down -v && docker compose up -d" + command="docker compose --env-file .env.dev down -v && docker compose --env-file .env.dev up -d" fi INSTANCE_ID=$(aws ec2 describe-instances --filters "Name=tag:Name,Values=bahmni-standard-docker" "Name=instance-state-name,Values=running" --query "Reservations[].Instances[].InstanceId" --output text) @@ -64,7 +64,7 @@ jobs: "commands": [ ". /home/ubuntu/.bash_profile", "git pull -r", - "docker compose pull", + "docker compose --env-file .env.dev pull", "'"$command"'", "docker image prune -f" ], diff --git a/bahmni-lite/.env.dev b/bahmni-lite/.env.dev new file mode 100644 index 0000000..f0a3822 --- /dev/null +++ b/bahmni-lite/.env.dev @@ -0,0 +1,141 @@ +# Docker Compose Variables +COMPOSE_PROFILES=emr + +# Environment variable to set the timezone for the containers +TZ=UTC + +# Host-Port Mappings, credentials for Atomfeed Sync across various services. Defaults to services running in docker. +OPENMRS_HOST=openmrs +OPENMRS_PORT=8080 +OPENMRS_ATOMFEED_USER=admin +OPENMRS_ATOMFEED_PASSWORD=Admin123 + +# Mail Config Properties Environment Variables +MAIL_TRANSPORT_PROTOCOL=smtps +MAIL_SMTP_AUTH=true +MAIL_SMTP_STARTTLS_ENABLE=true +MAIL_SMTP_SSL_ENABLE=true +MAIL_DEBUG=false +SEND_MAIL=false +MAIL_FROM= +MAIL_SMTP_HOST= +MAIL_SMTP_PORT= +MAIL_USER= +MAIL_PASSWORD= + +# Bahmni Config Environment Variables +CONFIG_IMAGE_TAG=latest +CONFIG_VOLUME=bahmni-config + +# OpenMRS Environment Variables +OPENMRS_IMAGE_TAG=latest +# OPENMRS_DB_IMAGE_NAME=mysql:5.7 +OPENMRS_DB_IMAGE_NAME=bahmni/openmrs-db:1.0.0-lite-mysql5.6 +OPENMRS_DB_NAME=openmrs +OPENMRS_DB_HOST=openmrsdb +OPENMRS_DB_USERNAME=openmrs-user +OPENMRS_DB_PASSWORD=password +OPENMRS_DB_CREATE_TABLES='false' +OPENMRS_DB_AUTO_UPDATE='true' +OPENMRS_MODULE_WEB_ADMIN='false' +# OMRS_DEV_DEBUG_PORT= +OMRS_JAVA_SERVER_OPTS='' +OMRS_JAVA_MEMORY_OPTS='' +OPENMRS_UPLOAD_FILES_PATH=./openmrs-uploads +BAHMNI_OPENMRS_MODULES_PATH= +MYSQL_ROOT_PASSWORD=adminAdmin!123 +OPENMRS_DB_TYPE=mysql +OPENMRS_DOCKER_ENV='true' +OMRS_C3P0_MAX_SIZE=50 + +# Crater Environment Variables +CRATER_PHP_IMAGE_TAG=latest +CRATER_NGINX_IMAGE_TAG=latest +CRATER_APP_URL=http://localhost:444 +CRATER_DB_HOST=craterdb +CRATER_DB_PORT=3306 +CRATER_DB_DATABASE=crater +CRATER_DB_USERNAME=crater +CRATER_DB_PASSWORD="crater" +CRATER_SANCTUM_STATEFUL_DOMAINS=localhost:444 +CRATER_SESSION_DOMAIN=localhost +CRATER_AUTO_INSTALL="true" +CRATER_ADMIN_NAME=Super Man +CRATER_ADMIN_EMAIL=superman@bahmni.org +CRATER_ADMIN_PASSWORD=Crater123 +CRATER_COMPANY_NAME=Bahmni +CRATER_COMPANY_SLUG=Bahmni +CRATER_COUNTRY_ID=101 +CRATER_APP_DEBUG=false + +# Bahmni Web Environment Variables +BAHMNI_WEB_IMAGE_TAG=latest +BAHMNI_APPS_PATH= + +# Bahmni Proxy Environment Variables +PROXY_IMAGE_TAG=latest + +# Implementer Interface Environment Variables +IMPLEMENTER_INTERFACE_IMAGE_TAG=latest +IMPLEMENTER_INTERFACE_CODE_PATH= + +# Bahmni LAB Environment Variables +BAHMNI_LAB_IMAGE_TAG=latest + +# Bahmni Reports Environment Variables +REPORTS_DB_NAME=bahmni_reports +REPORTS_DB_USERNAME=reports-user +REPORTS_DB_PASSWORD=password +REPORTS_IMAGE_TAG=latest + +#Patient Documents environmental variables +PATIENT_DOCUMENTS_TAG=latest + +#Appointments environmental variables +APPOINTMENTS_IMAGE_TAG=latest +APPOINTMENTS_PATH= + +#SMS-service Environment Variables +SMS_SERVICE_IMAGE_TAG=latest +SMS_TOKEN= +SMS_ORIGINATOR= + +#Loki Environment Variables +LOKI_IMAGE_TAG=2.6.0 +PROMTAIL_IMAGE_TAG=2.6.0 +GRAFANA_IMAGE_TAG=latest + +#Crater-Atomfeed Environment variables +CRATER_USERNAME=superman@bahmni.org +CRATER_PASSWORD=Crater123 +CRATER_ATOMFEED_DB_USERNAME=crater_atomfeed_user +CRATER_ATOMFEED_DB_PASSWORD=passw0rd +CRATER_ATOMFEED_DB_ROOT_PASSWORD=root@123 +CRATER_ATOMFEED_DB_HOST=crater-atomfeed-db +CRATER_ATOMFEED_DB_PORT=3306 +CRATER_ATOMFEED_DB_NAME=crater_atomfeed +CRATER_URL=http://crater-nginx +CRATER_ATOMFEED_IMAGE_TAG=latest + +# Metabase Environment variables +METABASE_IMAGE_TAG=latest +METABASE_ADMIN_EMAIL=admin@mybahmni.org +METABASE_ADMIN_FIRST_NAME=Admin +METABASE_ADMIN_PASSWORD=Admin@123 +METABASE_DB_NAME=metabase +METABASE_DB_USER=metabase-user +METABASE_DB_PASSWORD=password +METABASE_DB_HOST=metabasedb +METABASE_DB_PORT=5432 + +#Metabase Postgres Environment Variables +METABASE_POSTGRES_IMAGE_TAG=15.1 + +#Bahmni-Mart Environment Variable +BAHMNI_MART_DB_IMAGE_TAG=15.1 +BAHMNI_MART_IMAGE_TAG=latest +MART_CRON_TIME="*/15 * * * *" +MART_DB_HOST=martdb +MART_DB_NAME=martdb +MART_DB_USERNAME=bahmni-mart +MART_DB_PASSWORD=password diff --git a/bahmni-standard/.env.dev b/bahmni-standard/.env.dev new file mode 100644 index 0000000..0b6bd1e --- /dev/null +++ b/bahmni-standard/.env.dev @@ -0,0 +1,156 @@ +# Docker Compose Variables +COMPOSE_PROFILES=emr + +# Host-Port Mappings, credentials for Atomfeed Sync across various services. Defaults to services running in docker. +OPENMRS_HOST=openmrs +OPENMRS_PORT=8080 +OPENMRS_ATOMFEED_USER=admin +OPENMRS_ATOMFEED_PASSWORD=test +OPENELIS_HOST=openelis +OPENELIS_PORT=8052 +OPENELIS_ATOMFEED_USER=atomfeed +OPENELIS_ATOMFEED_PASSWORD=AdminadMIN* +ODOO_HOST=odoo +ODOO_PORT=8069 +ODOO_ATOMFEED_USER=admin +ODOO_ATOMFEED_PASSWORD=admin + +# Mail Config Properties Environment Variables +MAIL_TRANSPORT_PROTOCOL=smtps +MAIL_SMTP_AUTH=true +MAIL_SMTP_STARTTLS_ENABLE=true +MAIL_SMTP_SSL_ENABLE=true +MAIL_DEBUG=false +SEND_MAIL=false +MAIL_FROM= +MAIL_SMTP_HOST= +MAIL_SMTP_PORT= +MAIL_USER= +MAIL_PASSWORD= + +# Bahmni Config Environment Variables +CONFIG_IMAGE_TAG=latest +CONFIG_VOLUME=bahmni-config + +# OpenElis Environment Variables +OPENELIS_IMAGE_TAG=latest +OPENELIS_DB_IMAGE_TAG=demo-latest +OPENELIS_DB_SERVER=openelisdb +OPENELIS_DB_DUMP_PATH=./openelis-db-dump +OPENELIS_DB_HOST=openelisdb +OPENELIS_DB_USER=postgres +OPENELIS_DB_PASSWORD=postgres + +# Odoo Environment Variables +ODOO_IMAGE_TAG=latest +ODOO_DB_IMAGE_TAG=demo-latest +ODOO_DB_HOST=odoodb +ODOO_DB_NAME=odoo +ODOO_DB_USER=odoo +ODOO_DB_PASSWORD=odoo +ODOO_DB_DUMP_PATH=./odoo-db-dump +EXTRA_ADDONS_PATH=./extra-odoo-addons +BAHMNI_ODOO_MODULES_PATH= + +# Odoo Connect Environment Variables +ODOO_CONNECT_IMAGE_TAG=latest + +# OpenMRS Environment Variables +OPENMRS_IMAGE_TAG=latest +OPENMRS_DB_IMAGE_NAME=bahmni/openmrs-db:demo-latest +OPENMRS_DB_NAME=openmrs +OPENMRS_DB_HOST=openmrsdb +OPENMRS_DB_USERNAME=openmrs-user +OPENMRS_DB_PASSWORD=password +OPENMRS_DB_CREATE_TABLES='false' +OPENMRS_DB_AUTO_UPDATE='true' +OPENMRS_MODULE_WEB_ADMIN='false' +# OMRS_DEV_DEBUG_PORT= +OMRS_JAVA_SERVER_OPTS='' +OMRS_JAVA_MEMORY_OPTS='' +OPENMRS_UPLOAD_FILES_PATH=./openmrs-uploads +BAHMNI_OPENMRS_MODULES_PATH= +MYSQL_ROOT_PASSWORD=adminAdmin!123 +OPENMRS_DB_TYPE=mysql +OMRS_C3P0_MAX_SIZE=50 + +# Bahmni Web Environment Variables +BAHMNI_WEB_IMAGE_TAG=latest +BAHMNI_APPS_PATH= + +# Bahmni Proxy Environment Variables +PROXY_IMAGE_TAG=latest + +# Implementer Interface Environment Variables +IMPLEMENTER_INTERFACE_IMAGE_TAG=latest +IMPLEMENTER_INTERFACE_CODE_PATH= + +# Bahmni Reports Environment Variables +REPORTS_DB_NAME=bahmni_reports +REPORTS_DB_USERNAME=reports-user +REPORTS_DB_PASSWORD=password +REPORTS_IMAGE_TAG=latest + +#Patient Documents environmental variables +PATIENT_DOCUMENTS_TAG=latest + +#Appointments environmental variables +APPOINTMENTS_IMAGE_TAG=latest +APPOINTMENTS_PATH= + +#Loki Environment Variables +LOKI_IMAGE_TAG=2.6.0 +PROMTAIL_IMAGE_TAG=2.6.0 +GRAFANA_IMAGE_TAG=latest + +#PACS DB Server Environment Variables +PACS_DB_HOST=pacsdb +PACS_DB_PORT=5432 +PACS_DB_ROOT_PASSWORD=postgres@123 + +#DCM4CHEE Environment Variables +DCM4CHEE_IMAGE_TAG=latest +DCM4CHEE_DB_NAME=pacs_db +DCM4CHEE_DB_USERNAME=pacs_user +DCM4CHEE_DB_PASSWORD=password@123 + +#PACS INTEGRATION Environment Variables +PACS_INTEGRATION_IMAGE_TAG=latest +PACS_INTEGRATION_DB_NAME=pacs_integration_db +PACS_INTEGRATION_DB_USERNAME=pacs_integration_user +PACS_INTEGRATION_DB_PASSWORD=password@123 + +#PACS Simulator Environment Variables +PACS_SIMULATOR_IMAGE_TAG=latest +PACS_SIMULATOR_TIMEOUT=20000 +PACS_SERVER_TYPE=dcm4chee +PACS_SERVER_URL=DCM4CHEE@dcm4chee:11112 +UPDATE_PACS_INTEGRATION_DB=true + +# Metabase Environment variables +METABASE_IMAGE_TAG=latest +METABASE_ADMIN_EMAIL=admin@mybahmni.org +METABASE_ADMIN_FIRST_NAME=Admin +METABASE_ADMIN_PASSWORD=Admin@123 +METABASE_DB_NAME=metabase +METABASE_DB_USER=metabase-user +METABASE_DB_PASSWORD=password +METABASE_DB_HOST=metabasedb +METABASE_DB_PORT=5432 + +#Metabase Postgres Environment Variables +METABASE_POSTGRES_IMAGE_TAG=15.1 + +#Bahmni-Mart Environment Variable +BAHMNI_MART_DB_IMAGE_TAG=15.1 +BAHMNI_MART_IMAGE_TAG=latest +MART_CRON_TIME="*/15 * * * *" +MART_DB_HOST=martdb +MART_DB_NAME=martdb +MART_DB_USERNAME=bahmni-mart +MART_DB_PASSWORD=password + +#SMS-service Environment Variables +SMS_SERVICE_IMAGE_TAG=latest +SMS_TOKEN= +SMS_ORIGINATOR=