Fix locale issue during bundle install in setup script

Dominik Sander 8 years ago
parent
commit
95955b7b5d
2 changed files with 4 additions and 5 deletions
  1. 2 5
      docker/single-process/scripts/prepare
  2. 2 0
      docker/single-process/scripts/setup

+ 2 - 5
docker/single-process/scripts/prepare

@@ -13,11 +13,6 @@ path-exclude=/usr/share/doc/*
13 13
 path-include=/usr/share/doc/*/copyright
14 14
 EOF
15 15
 
16
-cat > /etc/default/locale <<EOF
17
-LC_ALL=en_US.UTF-8
18
-LANG=en_US.UTF-8
19
-EOF
20
-
21 16
 export LC_ALL=C
22 17
 export DEBIAN_FRONTEND=noninteractive
23 18
 minimal_apt_get_install='apt-get install -y --no-install-recommends'
@@ -33,6 +28,8 @@ $minimal_apt_get_install build-essential checkinstall git-core \
33 28
   graphviz libgraphviz-dev \
34 29
   libmysqlclient-dev libpq-dev libsqlite3-dev \
35 30
   ruby2.2 ruby2.2-dev
31
+locale-gen en_US.UTF-8
32
+update-locale LANG=en_US.UTF-8 LC_CTYPE=en_US.UTF-8
36 33
 gem install --no-ri --no-rdoc bundler
37 34
 
38 35
 apt-get purge -y python3* rsyslog rsync manpages

+ 2 - 0
docker/single-process/scripts/setup

@@ -18,6 +18,8 @@ cd app
18 18
 sudo -u huginn -H mkdir -p tmp/pids tmp/cache tmp/sockets log
19 19
 chmod -R u+rwX log tmp
20 20
 
21
+export LC_ALL=en_US.UTF-8
22
+
21 23
 # HACK: We need a database connection to precompile the assets, use sqlite for that
22 24
 echo "gem 'sqlite3', '~> 1.3.11'" >> Gemfile
23 25
 sudo -u huginn -H RAILS_ENV=production APP_SECRET_TOKEN=secret DATABASE_ADAPTER=sqlite3 ON_HEROKU=true bundle install --without test development --path vendor/bundle -j 4