diff --git a/docker-compose.yml b/docker-compose.yml index 8a0de47..9fc67f5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,57 +12,59 @@ services: DS_DM_PASSWORD: passthebutter SUFFIX_NAME: "dc=kosmos,dc=org" - # redis: - # restart: always - # image: redis:7-alpine - # networks: - # - internal_network - # healthcheck: - # test: ['CMD', 'redis-cli', 'ping'] - # volumes: - # - ./tmp/redis:/data + redis: + restart: always + image: redis:7-alpine + networks: + - internal_network + healthcheck: + test: ['CMD', 'redis-cli', 'ping'] + volumes: + - ./tmp/redis:/data - # web: - # build: . - # tty: true - # command: bash -c "rm -f /akkounts/tmp/pids/server.pid; bin/dev" - # volumes: - # - .:/akkounts - # networks: - # - external_network - # - internal_network - # ports: - # - "3000:3000" - # environment: - # RAILS_ENV: development - # REDIS_URL: redis://redis:6379/0 - # LDAP_HOST: ldap - # LDAP_PORT: 3389 - # LDAP_ADMIN_PASSWORD: passthebutter - # LDAP_USE_TLS: "false" - # depends_on: - # - ldap - # - redis + web: + build: . + tty: true + command: bash -c "rm -f /akkounts/tmp/pids/server.pid; bin/dev" + volumes: + - .:/akkounts + - /akkounts/node_modules + networks: + - external_network + - internal_network + ports: + - "3000:3000" + environment: + RAILS_ENV: development + PRIMARY_DOMAIN: kosmos.org + REDIS_URL: redis://redis:6379/0 + LDAP_HOST: ldap + LDAP_PORT: 3389 + LDAP_ADMIN_PASSWORD: passthebutter + LDAP_USE_TLS: "false" + depends_on: + - ldap + - redis - # sidekiq: - # build: . - # command: bash -c "bundle exec sidekiq -C config/sidekiq.yml" - # volumes: - # - .:/akkounts - # networks: - # - internal_network - # environment: - # RAILS_ENV: development - # REDIS_URL: redis://redis:6379/0 - # LDAP_HOST: ldap - # LDAP_PORT: 3389 - # LDAP_ADMIN_PASSWORD: passthebutter - # LDAP_USE_TLS: "false" - # LAUNCHY_DRY_RUN: true - # BROWSER: /dev/null - # depends_on: - # - ldap - # - redis + sidekiq: + build: . + command: bash -c "bundle exec sidekiq -C config/sidekiq.yml" + volumes: + - .:/akkounts + networks: + - internal_network + environment: + RAILS_ENV: development + REDIS_URL: redis://redis:6379/0 + LDAP_HOST: ldap + LDAP_PORT: 3389 + LDAP_ADMIN_PASSWORD: passthebutter + LDAP_USE_TLS: "false" + LAUNCHY_DRY_RUN: true + BROWSER: /dev/null + depends_on: + - ldap + - redis # phpldapadmin: # image: osixia/phpldapadmin:0.9.0