diff --git a/Dockerfile.dev b/Dockerfile.dev index c216b6b..a800f99 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -18,8 +18,8 @@ RUN su -c "bundle config github.https true; cd /var/www && bundle install --path WORKDIR /var/www USER web - -RUN bundle config github.https true; cd /var/www && bundle install --path /var/bundle --jobs 4 + +RUN bundle config github.https true; cd /var/www && bundle install -- path /var/bundle --jobs 4 USER root CMD ["/var/www/script/entry.sh"] diff --git a/config/puma.rb b/config/puma.rb index ca304e2..7e25934 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -1,5 +1,5 @@ require "dotenv" -Dotenv.load +Dotenv.load() base_path = (ENV['DEPLOY_PATH'] || Dir.pwd) #current_path = "#{base_path}/current" diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index f3b5c62..26aa01d 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -22,7 +22,7 @@ services: # Debugd # command: bash #tty: true - command: mysqld_safe --skip-grant-tables + # command: mysqld_safe --skip-grant-tables image: mariadb:latest volumes: - "./db_data:/var/lib/mysql"