diff --git a/README.md b/README.md index b2e7205..6ff6c17 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ so: 1. Make sure [Docker Compose is installed][1] and Docker is running (included in Docker Desktop) -2. Uncomment the `web` section in `docker-compose.yml` +2. Uncomment the `redis`, `web`, and `sidekiq` sections in `docker-compose.yml` 3. Run `docker compose up` and wait until 389ds announces its successful start in the log output 4. `docker-compose exec ldap dsconf localhost backend create --suffix="dc=kosmos,dc=org" --be-name="dev"` diff --git a/docker-compose.yml b/docker-compose.yml index 895b329..8a0de47 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,6 +11,59 @@ services: environment: 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 + + # 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 + + # 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 # ports: @@ -19,25 +72,6 @@ services: # PHPLDAPADMIN_HTTPS: false # PHPLDAPADMIN_LDAP_HOSTS: "#PYTHON2BASH:[{'ldap': [{'server': [{'tls': False}, {'port': 3389}]}, {'login': [{'bind_id': 'cn=Directory Manager'}, {'bind_pass': 'passthebutter'}]}]}]" # PHPLDAPADMIN_LDAP_CLIENT_TLS: false - 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 - LDAP_HOST: ldap - LDAP_PORT: 3389 - LDAP_ADMIN_PASSWORD: passthebutter - LDAP_USE_TLS: "false" - depends_on: - - ldap networks: external_network: