ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2025-01-15 14:20:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge conflicts

Browse source
This commit is contained in:
Ari Timonen 2020-03-08 22:58:52 +02:00
parent eff0543750
commit a511fb526e
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile.dev
View file

@ -19,7 +19,7 @@ RUN su -c "bundle config github.https true; cd /var/www && bundle install --path
WORKDIR /var/www WORKDIR /var/www
USER web 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 USER root
CMD ["/var/www/script/entry.sh"] CMD ["/var/www/script/entry.sh"]

2
config/puma.rb
View file

@ -1,5 +1,5 @@
require "dotenv" require "dotenv"
Dotenv.load Dotenv.load()
base_path = (ENV['DEPLOY_PATH'] || Dir.pwd) base_path = (ENV['DEPLOY_PATH'] || Dir.pwd)
#current_path = "#{base_path}/current" #current_path = "#{base_path}/current"

2
docker-compose.dev.yml
View file

@ -22,7 +22,7 @@ services:
# Debugd # Debugd
# command: bash # command: bash
#tty: true #tty: true
command: mysqld_safe --skip-grant-tables # command: mysqld_safe --skip-grant-tables
image: mariadb:latest image: mariadb:latest
volumes: volumes:
- "./db_data:/var/lib/mysql" - "./db_data:/var/lib/mysql"