From 1cf7464c5750f7697beaf63b641ee817b884ffe2 Mon Sep 17 00:00:00 2001 From: Ilya Mukhortov Date: Tue, 7 Jul 2020 22:15:21 +1000 Subject: [PATCH] pass --- medicine-stack/docker-compose.yml | 6 ++-- medicine/docker-compose.yml | 4 --- medicine/env.sample | 54 +++++++++++++++++++++++++++++++ tfoms-patient/docker-compose.yml | 2 -- 4 files changed, 56 insertions(+), 10 deletions(-) create mode 100644 medicine/env.sample diff --git a/medicine-stack/docker-compose.yml b/medicine-stack/docker-compose.yml index f6e0f38..99cd273 100644 --- a/medicine-stack/docker-compose.yml +++ b/medicine-stack/docker-compose.yml @@ -22,11 +22,9 @@ services: restart: "always" networks: - medicine-network - env_file: - - ../.env environment: - POSTGRES_USER: "${POSTGRES_USER}" - POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}" + POSTGRES_USER: "postgres" + POSTGRES_PASSWORD: "password" volumes: - ../volumes/postgres-data:/var/lib/postgresql/data logging: diff --git a/medicine/docker-compose.yml b/medicine/docker-compose.yml index 0d52d1f..69cef99 100644 --- a/medicine/docker-compose.yml +++ b/medicine/docker-compose.yml @@ -7,8 +7,6 @@ services: image: docker.med-logic.ru/medicine-nginx:latest container_name: medicine-nginx restart: "always" - env_file: - - ../.env volumes: - medicine-public-data:/app/public:ro links: @@ -30,8 +28,6 @@ services: image: docker.med-logic.ru/medicine-app:latest container_name: medicine-app restart: "always" - env_file: - - ../.env environment: UWSGI_PROCESSES: ${UWSGI_PROCESSES} UWSGI_THREADS: ${UWSGI_THREADS} diff --git a/medicine/env.sample b/medicine/env.sample new file mode 100644 index 0000000..b65b79f --- /dev/null +++ b/medicine/env.sample @@ -0,0 +1,54 @@ + +#################### +# APP ############## +#################### + +DEBUG=False + +DEBUG_TOOLBAR=False + +DJANGO_STATIC_HANDLER=False + +SECRET_KEY='%9nu_z5s&x*2_m8eb@r!0_sl@xat^8duh81xb$3-9un1853+^u' + +PATIENT_BASE_FIELDS_REQUIRED=True + +PATIENT_UID_OFFSET=1 + +HOST= + +HOST_DOCKER=192.168.160.1 + +CACHE_ENABLE=True + +SENTRY_ENABLED=True + +SENTRY_SITE="Название организации" + +COMPRESS_ENABLED=True + +SESSION_COOKIE_NAME=sessionid_medicine + +#################### +# Docker ########### +#################### + +NGINX_PORT=80 + +UWSGI_PROCESSES=4 + +UWSGI_THREADS=2 + +#################### +# Mixed ############ +#################### + +POSTGRES_USER=postgres +POSTGRES_PASSWORD=password +POSTGRES_DB=medicine + +REDIS_HOST=redis-host + +#################### +# OTHER ############ +#################### diff --git a/tfoms-patient/docker-compose.yml b/tfoms-patient/docker-compose.yml index d54e2c0..d05c574 100644 --- a/tfoms-patient/docker-compose.yml +++ b/tfoms-patient/docker-compose.yml @@ -7,8 +7,6 @@ services: container_name: tfoms-patient restart: "always" image: docker.med-logic.ru/tfoms-patient:latest - env_file: - - ../.env environment: - SENTRY_SITE=${SENTRY_SITE} - SQLALCHEMY_DATABASE_URI=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres-host/tfoms_patient