Merge pull request #11 from softvis-research/precompileassets

Precompileassets

Author: naraesk

evaluationserver/Dockerfile.prod

@@ -9,6 +9,13 @@ bundle install --jobs 4 --retry 3
 echo "Clearing logs"
 bin/rake log:clear
 
+production="production"
+
+if [ "$RAILS_ENV" == "$production" ]
+then
+bin/rails assets:precompile
+fi
+
 echo "Setting up new db if one doesn't exist"
 bundle exec rake db:migrate
 
@@ -21,4 +28,4 @@ rm -f tmp/pids/server.pid
 
 
 echo "Starting app server"
-bundle exec rails s -p 8081 -b 0.0.0.0
+bundle exec rails s -p 8081 -b 0.0.0.0

evaluationserver/bin/docker_start

@@ -10,7 +10,7 @@ development:
   pool: 5
   username: "<%=ENV['DEVELOPMENT_MYSQL_DB_USERNAME']%>"
   password: "<%=ENV['DEVELOPMENT_MYSQL_DB_PASSWORD']%>"
-  #host: db
+  host: db
 
 
 # Warning: The database defined as "test" will be erased and

evaluationserver/config/database.yml

@@ -17,7 +17,7 @@
   # Attempt to read encrypted secrets from `config/secrets.yml.enc`.
   # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or
   # `config/secrets.yml.key`.
-  config.read_encrypted_secrets = true
+  config.read_encrypted_secrets = false
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.

evaluationserver/config/environments/production.rb

@@ -1,7 +1,7 @@
 version: "3"
 services:
     db:
-        image: mysql
+        image: mysql:5.7
         environment:
             MYSQL_ROOT_PASSWORD: dbpassword_for_user
             MYSQL_DATABASE: eval_server_development
@@ -20,4 +20,4 @@ services:
             - db
 volumes:
   bundle:
-    driver: local
+    driver: local