Skip to content

Commit

Permalink
update docker-compose
Browse files Browse the repository at this point in the history
  • Loading branch information
Rémi Desgrange committed Nov 19, 2021
1 parent 4029008 commit f8c5d65
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 19 deletions.
2 changes: 2 additions & 0 deletions docker-compose-lib.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
40 changes: 21 additions & 19 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -154,6 +154,8 @@ services:
extends:
file: docker-compose-lib.yaml
service: pytree
ports:
- "5000:5000"

ldap:
image: lux-dev-ldap

0 comments on commit f8c5d65

Please sign in to comment.