Docker: update ruby to 2.3 and use RAILS_LOG_TO_STDOUT

Dominik Sander 7 years ago
parent
commit
aceace7950
3 changed files with 3 additions and 3 deletions
  1. 1 1
      docker/multi-process/scripts/init
  2. 1 1
      docker/scripts/prepare
  3. 1 1
      docker/single-process/scripts/init

+ 1 - 1
docker/multi-process/scripts/init

@@ -43,7 +43,7 @@ grep = /app/.env.example | sed -e 's/^#\([^ ]\)/\1/' | grep -v -e '^#' | \
43 43
 
44 44
 eval "echo RAILS_ENV=${RAILS_ENV}" >> .env
45 45
 eval "echo START_MYSQL=${START_MYSQL}" >> .env
46
-echo "ON_HEROKU=true" >> .env
46
+echo "RAILS_LOG_TO_STDOUT=true" >> .env
47 47
 echo "RAILS_SERVE_STATIC_FILES=true" >> .env
48 48
 
49 49
 chmod ugo+r /app/.env

+ 1 - 1
docker/scripts/prepare

@@ -27,7 +27,7 @@ $minimal_apt_get_install build-essential checkinstall git-core \
27 27
   libncurses5-dev libffi-dev libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev \
28 28
   graphviz libgraphviz-dev \
29 29
   libmysqlclient-dev libpq-dev libsqlite3-dev \
30
-  ruby2.2 ruby2.2-dev
30
+  ruby2.3 ruby2.3-dev
31 31
 locale-gen en_US.UTF-8
32 32
 update-locale LANG=en_US.UTF-8 LC_CTYPE=en_US.UTF-8
33 33
 gem install --no-ri --no-rdoc bundler

+ 1 - 1
docker/single-process/scripts/init

@@ -29,7 +29,7 @@ grep = /app/.env.example | sed -e 's/^#\([^ ]\)/\1/' | grep -v -e '^#' | \
29 29
 
30 30
 eval "echo PORT=${PORT:-${PORT:-3000}}" >> .env
31 31
 eval "echo RAILS_ENV=${RAILS_ENV:-${RAILS_ENV:-production}}" >> .env
32
-eval "echo ON_HEROKU=true" >> .env
32
+eval "echo RAILS_LOG_TO_STDOUT=true" >> .env
33 33
 eval "echo RAILS_SERVE_STATIC_FILES=true" >> .env
34 34
 
35 35
 chmod ugo+r /app/.env