From f8c5d65520e55e47d3fb1788dcabe8704dc0c47f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Desgrange?= Date: Fri, 19 Nov 2021 10:17:53 +0100 Subject: [PATCH] update docker-compose --- docker-compose-lib.yaml | 2 ++ docker-compose.yaml | 40 +++++++++++++++++++++------------------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/docker-compose-lib.yaml b/docker-compose-lib.yaml index 536c1488f..0e052fbc3 100644 --- a/docker-compose-lib.yaml +++ b/docker-compose-lib.yaml @@ -303,6 +303,8 @@ services: pytree: image: camptocamp/pytree + environment: + - DEPLOY_ENV=PROD volumes: - ./lidar/data:/home/pytree/data/processed - ./lidar/pytree.yml:/home/pytree/pytree.yml diff --git a/docker-compose.yaml b/docker-compose.yaml index 0adabdb58..0901f4c1a 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -10,17 +10,17 @@ services: file: docker-compose-lib.yaml service: config -# print: -# extends: -# file: docker-compose-lib.yaml -# service: print -# volumes_from: -# - config:ro -# ports: -# - 28080:8080 -# environment: -# - CATALINA_OPTS=-Xmx1024m -# - PGOPTIONS=-c statement_timeout=30000 + print: + extends: + file: docker-compose-lib.yaml + service: print + volumes_from: + - config:ro + ports: + - 28080:8080 + environment: + - CATALINA_OPTS=-Xmx1024m + - PGOPTIONS=-c statement_timeout=30000 redis: extends: @@ -131,14 +131,14 @@ services: # - config:ro # Rich image for project development with e.-g. vim, tree, awscli, psql, ... - # tools: - # volumes_from: - # - config:rw - # volumes: - # - .:/src - # extends: - # file: docker-compose-lib.yaml - # service: tools + tools: + volumes_from: + - config:rw + volumes: + - .:/src + extends: + file: docker-compose-lib.yaml + service: tools # lux specific additions elasticsearch: @@ -154,6 +154,8 @@ services: extends: file: docker-compose-lib.yaml service: pytree + ports: + - "5000:5000" ldap: image: lux-dev-ldap