Revert "test"

This reverts commit 2c9b740.

Author: Janghyun(JK)Kim

Dockerfile

@@ -94,26 +94,30 @@ ENV RAILS_ENV=${rails_env}
 #ENV FAVOR_LOCAL_GEMS 1
 
 #### OpenStudio Server Code
-# 1. Setup workspace
-WORKDIR /opt/openstudio/server
-
-# 2. Add Gemfiles and install Ruby dependencies first (for caching)
+# First upload the Gemfile* so that it can cache the Gems -- do this first because it is slow
+ADD /bin /opt/openstudio/bin
 ADD /server/Gemfile /opt/openstudio/server/Gemfile
+WORKDIR /opt/openstudio/server
 RUN bundle _${OS_BUNDLER_VERSION}_ install --jobs=3 --retry=3 ${bundle_args}
 
-# 3. NOW ADD THE ENTIRE SERVER CODE 
-# (This ensures rake has everything it needs to precompile)
-ADD /server /opt/openstudio/server
-ADD /bin /opt/openstudio/bin
-ADD .rubocop.yml /opt/openstudio/.rubocop.yml
+# Add the app assets and precompile assets. Do it this way so that when the app changes the assets don't
+# have to be recompiled everytime
+ADD /server/Rakefile /opt/openstudio/server/Rakefile
+ADD /server/config/ /opt/openstudio/server/config/
+ADD /server/app/assets/ /opt/openstudio/server/app/assets/
 
-# 4. Create log directory and Precompile Assets
-# Added SECRET_KEY_BASE and RAILS_ENV to prevent "Abort" crashes
-RUN mkdir -p /opt/openstudio/server/log && \
-    SECRET_KEY_BASE=dummy_key_for_build RAILS_ENV=production bundle exec rake assets:precompile --trace
+# Now call precompile
+RUN mkdir /opt/openstudio/server/log
+RUN bundle exec rake assets:precompile --trace
 
-# 5. Final bundle check
-RUN rm -f Gemfile.lock && bundle install --jobs=3 --retry=3
+# Bundle app source
+ADD /server /opt/openstudio/server
+# Add in /spec for testing 
+#ADD /server/spec /opt/openstudio/server/spec
+ADD .rubocop.yml /opt/openstudio/.rubocop.yml
+# Run bundle again, because if the user has a local Gemfile.lock it will have been overriden
+RUN rm Gemfile.lock
+RUN bundle install --jobs=3 --retry=3
 
 # Add in scripts for running server. This includes the wait-for-it scripts to ensure other processes (mongo, redis) have
 # started before starting the main process.