Commit 8302af40 authored by Carina Antunes's avatar Carina Antunes
Browse files

update full compose

parent 722d1a1e
......@@ -42,7 +42,7 @@ INVENIO_SEARCH_INDEX_PREFIX=cernsearch-
INVENIO_SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://uservice:itsjust1234@localhost/uservice
INVENIO_THEME_FRONTPAGE_TITLE='CERN Search DEV'
INVENIO_THEME_LOGO=/images/cernsearchicon.png
INVENIO_THEME_LOGO_ADMIN:=/images/cernsearchicon.png
INVENIO_THEME_LOGO_ADMIN=/images/cernsearchicon.png
INVENIO_THEME_SITENAME='CERN Search DEV'
RABBITMQ_DEFAULT_PASS=password
......
......@@ -27,10 +27,15 @@ RUN chmod 666 /${WORKING_DIR}/src/uwsgi.pid
# Patch auth
RUN sh /${WORKING_DIR}/src/scripts/patch/oauth_patch.sh
# Install UI
USER invenio
ENV LOGS_DIR=/var/log
RUN mkdir -p ${LOGS_DIR}
RUN chown -R invenio:root ${LOGS_DIR}
# Tika default logs dir
ENV TIKA_LOG_PATH=${LOGS_DIR}
# Install UI
USER invenio
RUN invenio collect -v
RUN invenio webpack buildall
# Move static files to instance folder
......
......@@ -41,6 +41,8 @@ services:
condition: service_started
rabbitmq:
condition: service_healthy
tika:
condition: service_started
networks:
- default
env_file:
......@@ -55,7 +57,6 @@ services:
interval: 60s
timeout: 10s
retries: 5
start_period: 30s
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.1.1
......@@ -73,7 +74,6 @@ services:
interval: 30s
timeout: 30s
retries: 10
start_period: 30s
kibana:
image: docker.elastic.co/kibana/kibana-oss:7.1.1
......@@ -132,7 +132,6 @@ services:
interval: 60s
timeout: 10s
retries: 3
start_period: 20s
flower:
image: mher/flower
......
......@@ -60,7 +60,6 @@ services:
interval: 60s
timeout: 10s
retries: 5
start_period: 30s
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.1.1
......@@ -78,7 +77,6 @@ services:
interval: 30s
timeout: 10s
retries: 5
start_period: 30s
kibana:
image: docker.elastic.co/kibana/kibana-oss:7.1.1
......@@ -137,7 +135,6 @@ services:
interval: 60s
timeout: 10s
retries: 3
start_period: 20s
flower:
image: mher/flower
......
......@@ -22,7 +22,6 @@ services:
interval: 30s
timeout: 10s
retries: 5
start_period: 30s
kibana:
image: docker.elastic.co/kibana/kibana-oss:7.1.1
......@@ -43,21 +42,19 @@ services:
postgres:
image: centos/postgresql-95-centos7
environment:
- POSTGRESQL_USER
- POSTGRESQL_PASSWORD
- POSTGRESQL_DATABASE
volumes:
- pgsql-data:/var/lib/pgsql/data
networks:
- default
ports:
- 5432:5432
env_file:
- .pipenv.env
rabbitmq:
image: rabbitmq:3.8.2-management
env_file:
- .env
- .pipenv.env
restart: "always"
ports:
- "15672:15672"
......@@ -69,7 +66,6 @@ services:
interval: 60s
timeout: 10s
retries: 3
start_period: 20s
tika:
image: apache/tika:1.24
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment