diff --git a/README.md b/README.md index cea2899..36c2c5f 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ sh ./docker-build.sh SingleUser do signup for access ## Restarting Jackhammer - +__Caution: This operation removes all data.__ ``` docker-compose stop docker-compose rm diff --git a/docker-compose.yml b/docker-compose.yml old mode 100755 new mode 100644 index a59d4fd..015c6f9 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,47 +1,36 @@ version: '3' -volumes: - # We'll define a volume that will store the data from the mysql databases: - mysql-data: - driver: local services: - mysqldb: - image: mysql - container_name: jackhammer-db - environment: - MYSQL_ROOT_PASSWORD: root - MYSQL_DATABASE: jackhammer_production - ports: - - "3306:3306" - volumes: - - mysql-data:/usr/local/bin/mysql - restart: always - healthcheck: - test: "nc -z localhost 3306" - interval: 1s - retries: 120 - web: - build: ./web - volumes: - - '.:/jackhammer' - ports: - - "5000:3000" - command: bash -c "bundle exec sidekiq -C config/sidekiq.yml -d && bundle exec puma -e production -b tcp://0.0.0.0:3000" - environment: - - REDIS_URL=redis://redis:6379 - - SECRET_KEY_BASE=454ab84a2554a5e715db90c7560a06d8a20811d614e7313de05495ecdeac9614c4c3d263df1a5892b92d6c32ea06d4defbd2492c598e8295f89b8b316db25842 - - RAILS_SERVE_STATIC_FILES=true - - RAILS_ENV=production - - MYSQL_DB=jackhammer_production - - MYSQL_HOST=mysqldb - - MYSQL_USER=root - - MYSQL_PASSWORD=root - links: - - mysqldb:mysqldb - - redis:redis - depends_on: - - mysqldb - - redis - redis: - image: redis - ports: - - "6379" + mysqldb: + image: mysql + container_name: jackhammer-db + environment: + MYSQL_ROOT_PASSWORD: root + MYSQL_DATABASE: jackhammer_production + ports: + - "3306:3306" + web: + build: ./web + volumes: + - '.:/jackhammer' + ports: + - "5000:3000" + command: bash -c "bundle exec sidekiq -C config/sidekiq.yml -d && bundle exec puma -e production -b tcp://0.0.0.0:3000" + environment: + - REDIS_URL=redis://redis:6379 + - SECRET_KEY_BASE=454ab84a2554a5e715db90c7560a06d8a20811d614e7313de05495ecdeac9614c4c3d263df1a5892b92d6c32ea06d4defbd2492c598e8295f89b8b316db25842 + - RAILS_SERVE_STATIC_FILES=true + - RAILS_ENV=production + - MYSQL_DB=jackhammer_production + - MYSQL_HOST=mysqldb + - MYSQL_USER=root + - MYSQL_PASSWORD=root + links: + - mysqldb:mysqldb + - redis:redis + depends_on: + - mysqldb + - redis + redis: + image: redis + ports: + - "6379"