Update docker version

Update fig.yml to work
Update puma to not daemonize to work
Update dockerfile too

This version should work now.
This commit is contained in:
Ari Timonen 2018-04-15 11:17:59 +00:00
parent 3984ad2442
commit e3275b34ce
3 changed files with 7 additions and 3 deletions

View file

@ -34,6 +34,7 @@ RUN bundle install --path /var/bundle --jobs 4
USER root USER root
# FIXME: move this to docker image
RUN apt-get install -y memcached RUN apt-get install -y memcached
RUN service memcached start RUN service memcached start

View file

@ -10,7 +10,7 @@ stdout_path = "#{base_path}/lpuma.stdout.log"
tag 'ENSL' tag 'ENSL'
preload_app! preload_app!
daemonize true daemonize false
directory base_path directory base_path
pidfile "#{base_path}/tmp/puma.pid" pidfile "#{base_path}/tmp/puma.pid"
state_path "#{base_path}/tmp/puma.state" state_path "#{base_path}/tmp/puma.state"

View file

@ -1,11 +1,14 @@
web: web:
image: ensl image: ensl
volumes:
- "/srv/ensl/public:/var/www/public"
ports: "4000:4000"
links: links:
- mysql - mysql
# - redis # - redis
mysql: mysql:
image: mysql/mysql-server image: mysql/mysql-server:5.7
volumes: volumes:
- /srv/ensl/mysql:/var/lib/mysql - "/srv/ensl/mysql:/var/lib/mysql"
#redis: #redis:
# image: redis # image: redis