Pull from master

2018-08-20 11:26:07 +06:30
parent 3c2faf5970
commit d1852d24c3
28 changed files with 464 additions and 216 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,16 +1,17 @@
 version: '3'
 services:
  code2lab:
-    build: .
+    build:
+      context: .
+      dockerfile: ./Dockerfile
    links:
      - redis
-    command: bundle exec puma -C config/puma.rb
    volumes:
      - .:/sxrestaurant
    env_file:
      - .code2lab.env
    ports:
-      - '8081:62158'
+      - '8082:62158'
    environment:
      - REDIS_URL=redis://redis:6379/0
  sidekiq:
@@ -22,10 +23,9 @@ services:
       - .:/sxrestaurant
    environment:
      - REDIS_URL=redis://redis:6379/0
-
  redis:
    image: redis
    ports:
-      - '6379:6379'
+      - '6380:6379'
    volumes:
-      - ../data/redis:/data
+      - ../data/redis:/data