Skip to content

Commit 4e05bb7

Browse files
authored
update docker compose: elasticsearch is now optional (#61)
1 parent f352072 commit 4e05bb7

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

docker/docker-compose.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ x-backend: &backend # yaml anchor definition
55
image: ${APP_IMAGE}:${APP_TAG}
66
volumes:
77
- media_root:/app/media
8+
- xapian_index:/app/xapian_index
89
environment:
910
# PAPERMERGE__<section>__<variable>
1011
- PAPERMERGE__MAIN__SECRET_KEY=${SECRET_KEY}
@@ -15,9 +16,9 @@ x-backend: &backend # yaml anchor definition
1516
- PAPERMERGE__DATABASE__HOST=${DB_HOST}
1617
- PAPERMERGE__REDIS__HOST=${REDIS_HOST}
1718
- PAPERMERGE__REDIS__PORT=${REDIS_PORT}
18-
- PAPERMERGE__ELASTICSEARCH__HOSTS=${ES_HOSTS}
19-
- PAPERMERGE__ELASTICSEARCH__PORT=${ES_PORT}
2019
- PAPERMERGE__MAIN__TIMEZONE=${TIMEZONE}
20+
# path where xapian index data is stored
21+
- PAPERMERGE__SEARCH__PATH=/app/xapian_index
2122
- DJANGO_SUPERUSER_USERNAME=${SUPERUSER_USERNAME}
2223
- DJANGO_SUPERUSER_EMAIL=${SUPERUSER_EMAIL}
2324
- DJANGO_SUPERUSER_PASSWORD=${SUPERUSER_PASSWORD}
@@ -50,7 +51,7 @@ services:
5051
ports:
5152
- '6379:6379'
5253
volumes:
53-
- 'redisdata:/data'
54+
- redis_data:/data
5455
traefik:
5556
image: "traefik:v2.6"
5657
command:
@@ -69,15 +70,8 @@ services:
6970
labels:
7071
- "traefik.enable=true"
7172
- "traefik.http.routers.traefik.rule=Host(`${USE_HOSTNAME}`) && PathPrefix(`/`)"
72-
es:
73-
image: docker.elastic.co/elasticsearch/elasticsearch:7.16.2
74-
environment:
75-
- discovery.type=single-node
76-
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
77-
ports:
78-
- 9200:9200
79-
- 9300:9300
8073
volumes:
8174
postgres_data:
8275
media_root:
83-
redisdata:
76+
xapian_index:
77+
redis_data:

0 commit comments

Comments
 (0)