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

Backport fixes from rails4 branch

Browse source 
Fix row issue in profiles, fix tests.
This commit is contained in:
Ari Timonen 2020-03-15 09:53:23 +02:00
parent d7f2538085
commit 059be8a76a
7 changed files with 73 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
.env.development Normal file
View file

@ -0,0 +1,26 @@
RACK_ENV=development
RAILS_ENV=development
APP_SECRET=fe837ea72667ec3d8ecb94cfba1a1bba
DEPLOY_PATH=/var/www
PUMA_WORKERS=1
PUMA_MIN_THREADS=1
PUMA_MAX_THREADS=16
PUMA_PORT=4000
PUMA_TIMEOUT=30
MYSQL_HOST=db
MYSQL_DATABASE=ensl
MYSQL_USERNAME=ensl
MYSQL_PASSWORD=ensl
MYSQL_ROOT_PASSWORD=ensl
MYSQL_CONNECTION_POOL=8
NEW_RELIC_APP_NAME=ENSL
NEW_RELIC_LICENSE_KEY=
EXCEPTIONAL_API_KEY=
GOOGLE_API_KEY=
GOOGLE_CALENDAR_ID=

26
.env.test Normal file
View file

@ -0,0 +1,26 @@
RACK_ENV=test
RAILS_ENV=test
APP_SECRET=fe837ea72667ec3d8ecb94cfba1a1bba
DEPLOY_PATH=/var/www
PUMA_WORKERS=1
PUMA_MIN_THREADS=1
PUMA_MAX_THREADS=16
PUMA_PORT=4000
PUMA_TIMEOUT=30
MYSQL_HOST=db
MYSQL_DATABASE=ensl_test
MYSQL_USERNAME=ensl
MYSQL_PASSWORD=ensl
MYSQL_ROOT_PASSWORD=ensl
MYSQL_CONNECTION_POOL=8
NEW_RELIC_APP_NAME=ENSL
NEW_RELIC_LICENSE_KEY=
EXCEPTIONAL_API_KEY=
GOOGLE_API_KEY=
GOOGLE_CALENDAR_ID=

4
Gemfile.lock
View file

@ -1,6 +1,6 @@
GIT GIT
remote: git://github.com/koraktor/steam-condenser-ruby.git remote: https://github.com/koraktor/steam-condenser-ruby.git
revision: 5795d15152995cc6bada5265fa379cfc57103618 revision: 2cb441f0518a0b8d20a017dfcc42783ae878311a
specs: specs:
steam-condenser (1.3.11) steam-condenser (1.3.11)
multi_json (~> 1.6) multi_json (~> 1.6)

2
db/schema.rb
View file

@ -607,7 +607,7 @@ ActiveRecord::Schema.define(:version => 20171109165433) do
add_index "predictions", ["match_id"], :name => "index_predictions_on_match_id" add_index "predictions", ["match_id"], :name => "index_predictions_on_match_id"
add_index "predictions", ["user_id"], :name => "index_predictions_on_user_id" add_index "predictions", ["user_id"], :name => "index_predictions_on_user_id"
create_table "profiles", :force => true do |t| create_table "profiles", :options => 'ENGINE=MyISAM', :force => true do |t|
t.integer "user_id" t.integer "user_id"
t.string "msn" t.string "msn"
t.string "icq" t.string "icq"

6
docker-compose.dev.yml
View file

@ -2,6 +2,10 @@ version: "3"
services: services:
web: web:
# Debug
stdin_open: true
command: /bin/bash
tty: true
build: build:
context: ./ context: ./
dockerfile: Dockerfile.dev dockerfile: Dockerfile.dev
@ -17,7 +21,7 @@ services:
# - redis # - redis
db: db:
# Debug # Debug
# 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

3
ext/mysql.conf.d/opt.cnf
View file

@ -29,3 +29,6 @@ innodb_flush_method = O_DIRECT
#innodb_additional_mem_pool_size = 20M #innodb_additional_mem_pool_size = 20M
innodb_file_per_table = 1 innodb_file_per_table = 1
transaction-isolation = READ-COMMITTED transaction-isolation = READ-COMMITTED
innodb_file_per_table=1
innodb_file_format = Barracuda

16
script/entry.sh
View file

@ -1,11 +1,15 @@
#!/bin/bash #!/bin/bash
env
cd /var/www cd /var/www
source /var/www/.env
rm -rf /var/www/public/assets
mv /home/web/assets /var/www/public/
chown -R web:web /var/www/public
su -c "cd /var/www && bundle exec rake assets:precompile" -s /bin/bash -l web source /var/www/.env
if [ $RAILS_ENV = "production" ]; then
rm -rf /var/www/public/assets
mv /home/web/assets /var/www/public/
chown -R web:web /var/www
fi
su -c "bundle config github.https true; cd /var/www && bundle install --path /var/bundle --jobs 4" -s /bin/bash -l web
su -c "cd /var/www && bundle exec puma -C config/puma.rb" -s /bin/bash -l web su -c "cd /var/www && bundle exec puma -C config/puma.rb" -s /bin/bash -l web
bash