@@ -56,10 +56,10 @@ services:
5656 && openssl passwd -apr1 $NGINX_BASIC_AUTH_PW >> /etc/nginx/.htpasswd
5757 && sleep 120
5858 && /home/run.sh"
59- logging :
60- driver : syslog
61- options :
62- syslog-address : " udp://127.0.0.1:${SYSLOG_UDP_PORT}"
59+ # logging:
60+ # driver: syslog
61+ # options:
62+ # syslog-address: "udp://127.0.0.1:${SYSLOG_UDP_PORT}"
6363 depends_on : [consul, log, config-container]
6464
6565 nifi :
@@ -71,12 +71,25 @@ services:
7171 bash -c "/config/nifi/scripts/start.sh ${OL_NIFI_VERSION} ${DB_PASSWORD} ${INVOKEHTTP_PASSWORD}"
7272 environment :
7373 - NIFI_JVM_HEAP_MAX=${NIFI_JVM_HEAP_MAX}
74- logging :
75- driver : syslog
76- options :
77- syslog-address : " udp://127.0.0.1:${SYSLOG_UDP_PORT}"
74+ # logging:
75+ # driver: syslog
76+ # options:
77+ # syslog-address: "udp://127.0.0.1:${SYSLOG_UDP_PORT}"
7878 depends_on : [log, config-container, nginx]
7979
80+
81+ db :
82+ image : openlmis/postgres:${OL_POSTGRES_VERSION}
83+ command :
84+ " psql 'postgresql://${DATABASE_USERNAME}:${DATABASE_PASSWORD}@${DATABASE_HOST}/${DATABASE_NAME}' -f /var/lib/postgresql/data/OlmisCreateTableStatements.sql"
85+ volumes :
86+ - ./db/docker-entrypoint-initdb.d/templates:/var/lib/postgresql/data
87+ # logging:
88+ # driver: syslog
89+ # options:
90+ # syslog-address: "udp://127.0.0.1:${SYSLOG_UDP_PORT}"
91+ depends_on : [log, consul]
92+
8093 zookeeper :
8194 image : confluentinc/cp-zookeeper:${OL_ZOOKEEPER_VERSION}
8295 environment :
@@ -110,8 +123,6 @@ services:
110123 superset :
111124 build :
112125 context : ./superset
113- ports :
114- - " 8088:8088"
115126 env_file :
116127 - ./.env
117128 environment :
@@ -127,7 +138,6 @@ services:
127138 bash -c "cp -r /config/superset /etc/
128139 && apt-get update
129140 && apt-get install -y postgresql-client
130- && psql -v ON_ERROR_STOP=1 --username "$DATABASE_USERNAME" --dbname "${DATABASE_NAME}" < /etc/superset/db/OlmisCreateTableStatements.sql
131141 && sleep 30 && fabmanager create-admin --app superset --username ${SUPERSET_ADMIN_USERNAME} --firstname Admin --lastname Admin --email noreply --password ${SUPERSET_ADMIN_PASSWORD}
132142 && superset db upgrade
133143 && python3 /etc/superset/substitute_variables.py '/etc/superset/datasources/database.yaml' '/etc/superset/dashboards/openlmis_uat_dashboards.json'
0 commit comments