diff --git a/README.md b/README.md index 7585c935..5beca1d6 100644 --- a/README.md +++ b/README.md @@ -31,8 +31,24 @@ There are 2 ways to install homs. ``` wget https://raw.githubusercontent.com/latera/homs-docker/master/docker-compose.yml ``` -3. Run `docker-compose`: +3. Create directories for db datafiles: + ``` + mkdir -p /var/lib/hydra/activiti/postgresql + mkdir -p /var/lib/hydra/homs/postgresql + ``` +4. For OS X users: add `/var/lib/hydra/activiti/postgresql` and `/var/lib/hydra/homs/postgresql` in `Docker -> Preferences... -> File Sharing`. +5. Copy your (or default) configs to `/etc/hydra/homs/`: + + ``` + cp activiti.yml /etc/hydra/homs/activiti.yml + cp database.yml /etc/hydra/homs/database.yml + cp hbw.yml /etc/hydra/homs/hbw.yml + cp homs_configuration.yml /etc/hydra/homs/homs_configuration.yml + cp imprint.yml /etc/hydra/homs/imprint.yml + cp sources.yml /etc/hydra/homs/sources.yml + ``` +6. Run `docker-compose`: ``` docker-compose up -d ``` diff --git a/config/imprint.yml.sample b/config/imprint.yml.sample index ca87ced7..0e646830 100644 --- a/config/imprint.yml.sample +++ b/config/imprint.yml.sample @@ -1,7 +1,7 @@ development: &development - base_url: http://localhost:2300/api/ - auth_token: auth_token - x_imprint_api_version: 1 + base_url: 'http://localhost:2300/api/' + auth_token: 'changeme' + api_version: '1' staging: <<: *development diff --git a/docker-compose.yml b/docker-compose.yml index 05732b66..8a2a0d67 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,10 +2,29 @@ version: '2' services: db_activiti: image: latera/postgres-activiti + hostname: postgres-activiti container_name: postgres-activiti + restart: always + environment: + PGDATA: /var/lib/postgresql/data/activiti/ + POSTGRES_USER: activiti + TZ: Europe/Moscow + volumes: + - /var/lib/hydra/activiti/postgresql:/var/lib/postgresql/data + networks: + - custom_network db_homs: image: latera/postgres-homs + hostname: postgres-homs container_name: postgres-homs + environment: + PGDATA: /var/lib/postgresql/data/homs + POSTGRES_USER: homs + TZ: Europe/Moscow + volumes: + - /var/lib/hydra/homs/postgresql:/var/lib/postgresql/data + networks: + - custom_network activiti_homs: image: latera/activiti-homs container_name: activiti @@ -16,14 +35,33 @@ services: - HOMS_HOST=homs ports: - 8080:8080 + depends_on: + - db_activiti + networks: + - custom_network homs: image: latera/homs container_name: homs links: - db_homs:postgres-homs - activiti_homs:activiti + volumes: + - /etc/hydra/homs/homs_configuration.yml:/opt/homs/config/homs_configuration.yml + - /etc/hydra/homs/imprint.yml:/opt/homs/config/imprint.yml + - /etc/hydra/homs/hbw.yml:/opt/homs/config/hbw.yml + - /etc/hydra/homs/database.yml:/opt/homs/config/database.yml + - /etc/hydra/homs/activiti.yml:/opt/homs/config/activiti.yml + - /etc/hydra/homs/sources.yml:/opt/homs/config/sources.yml environment: - ACTIVITI_HOST=activiti - DB_HOST=postgres-homs + depends_on: + - db_homs + - activiti_homs ports: - 3000:3000 + networks: + - custom_network +networks: + custom_network: + driver: bridge