Tmc/working docker build

.ruby-version

@@ -1 +1 @@
-ruby-2.0.0-p648
+ruby-2.1.0

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 ruby '2.0.0'
 
-gem 'rails', '3.2.17'
+gem 'rails', '3.2.13'
 gem 'pg', '0.17.1'
 gem 'unicorn' # app server
 gem 'foreman' # process manager

app/assets/javascripts/backbone/apps/fstations/list/list_view.js.coffee

@@ -712,7 +712,8 @@
             mapc = L.tileLayer("http://tiles.mapc.org/basemap/{z}/{x}/{y}.png",
               attribution: 'Map tiles by <a href="http://leafletjs.com">MAPC</a>'
             )
-            streets = L.tileLayer.provider "MapBox.mapc.i8ddbf5a"
+            # streets = L.tileLayer.provider "MapBox.mapc.i8ddbf5a"
+            streets = L.tileLayer.provider "Esri.WorldStreetMap"
             esri = L.tileLayer.provider "Esri.WorldImagery"
             streets.addTo(map)
             basemap = new L.MAPCTileLayer("basemap")

bin/entrypoint.sh

@@ -4,10 +4,10 @@ set -e
 # Remove a potentially pre-existing server.pid for Rails.
 rm -f /myapp/tmp/pids/server.pid
 
-# until psql -h "db" -U "postgres" -c '\q'; do
-#   >&2 echo "Postgres is unavailable - sleeping"
-#   sleep 1
-# done
+until psql -h "db" -U "postgres" -c '\q'; do
+  >&2 echo "Postgres is unavailable - sleeping"
+  sleep 1
+done
 
-# >&2 echo "Postgres is up - executing command"
+>&2 echo "Postgres is up - executing command"
 exec "$@"

docker-compose.yml

@@ -4,6 +4,8 @@ services:
     image: postgres:9
     volumes:
       - ./tmp/db:/var/lib/postgresql/data
+    environment:
+      POSTGRES_HOST_AUTH_METHOD: "trust"
   web:
     build: .
     command: bash -c "rm -f tmp/pids/server.pid && bundle exec rails s -p 3000 -b '0.0.0.0'"