diff --git a/Gemfile.lock b/Gemfile.lock index 2a39b9a..5b5d108 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -294,6 +294,7 @@ GEM zeitwerk (2.6.6) PLATFORMS + ruby x86_64-linux DEPENDENCIES diff --git a/Procfile.dev b/Procfile.dev index 0c4b735..43d5be3 100644 --- a/Procfile.dev +++ b/Procfile.dev @@ -1,2 +1,2 @@ -web: bin/rails server -p 3000 +web: bin/rails server -b 0.0.0.0 -p 3000 css: yarn build:css --watch diff --git a/config/ldap.yml b/config/ldap.yml index 9f41086..17b4505 100644 --- a/config/ldap.yml +++ b/config/ldap.yml @@ -26,13 +26,13 @@ authorizations: &AUTHORIZATIONS ## Environment development: - host: 192.168.56.5 - port: 389 + host: <%= ENV["LDAP_HOST"] || "localhost" %> + port: <%= ENV["LDAP_PORT"] || "389" %> attribute: cn base: ou=kosmos.org,cn=users,dc=kosmos,dc=org admin_user: "cn=Directory Manager" - admin_password: localpass - # ssl: false + admin_password: <%= ENV["LDAP_ADMIN_PASSWORD"] %> + ssl: <%= ENV["LDAP_USE_TLS"] || "false" %> # <<: *AUTHORIZATIONS test: diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..c4e3830 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,24 @@ +services: + ldap: + image: 4teamwork/389ds:latest + volumes: + - ./tmp/389ds:/data + environment: + DS_DM_PASSWORD: passthebutter + SUFFIX_NAME: "dc=kosmos,dc=org" + web: + build: . + tty: true + command: bash -c "rm -f tmp/pids/server.pid && bin/dev" + volumes: + - .:/akkounts + ports: + - "3000:3000" + environment: + RAILS_ENV: development + LDAP_HOST: ldap + LDAP_PORT: 3389 + LDAP_ADMIN_PASSWORD: passthebutter + LDAP_USE_TLS: "false" + depends_on: + - ldap