Merge pull request #599 from PecanProject/fix-download-url

fix download url and oter small docker fixes

Author: robkooper

CHANGELOG.md

@@ -0,0 +1,29 @@
+# Change Log
+All notable changes are kept in this file. All changes made should be added to the section called
+`Unreleased`. Once a new release is made this file will be updated to create a new `Unreleased`
+section for the next release.
+
+For more information about this file see also [Keep a Changelog](http://keepachangelog.com/) .
+
+
+## [5.0.3] - 2018-09-28
+
+### Fixes
+
+- #593 : Replaces references to gitter with references to slack.
+- #598 : Fixes issue in docker where the entrypoint referenced a wrong URL to download the initial schema from.
+
+## [5.0.2] - 2018-08-09
+
+### Fixes
+- Update to sprockets gem
+
+## [5.0.1] - 2018-08-08
+
+### Fixes
+- Fixes fuzzy matching used in search queries
+
+## [5.0.0] - 2018-08-07
+
+### Fixes
+- Major upgrade to rails 5, make sure to read documentation on how to upgrade.

docker-compose.yml

@@ -3,7 +3,7 @@ version: "3"
 services:
   # BETY rails frontend to the database
   bety:
-    image: pecan/bety:unicorn
+    image: pecan/bety:${BRANCH:-latest}
     networks:
       - bety
     ports:
@@ -14,12 +14,6 @@ services:
     depends_on:
       - postgres
     restart: unless-stopped
-    deploy:
-      mode: replicated
-      restart_policy:
-        condition: any
-      placement:
-        constraints: [node.role == manager]
 
   # postgresql + postgis to hold all the data
   postgres:
@@ -31,12 +25,6 @@ services:
     volumes:
       - postgres:/var/lib/postgresql/data
     restart: unless-stopped
-    deploy:
-      mode: replicated
-      restart_policy:
-        condition: any
-      placement:
-        constraints: [node.role == worker]
 
 networks:
   bety:

docker/entrypoint.sh

@@ -6,7 +6,7 @@ case $1 in
         echo "Create new database, initialized from all data."
         psql -h postgres -p 5432 -U postgres -c "CREATE ROLE bety WITH LOGIN CREATEDB NOSUPERUSER NOCREATEROLE PASSWORD 'bety'"
         psql -h postgres -p 5432 -U postgres -c "CREATE DATABASE bety WITH OWNER bety"
-        ./load.bety.sh -a "postgres" -d "bety" -p "-h postgres -p 5432" -o bety -c -u -g -m ${LOCAL_SERVER} -r 0 -w https://ebi-forecast.igb.illinois.edu/pecan/dumpall/bety.tar.gz
+        ./load.bety.sh -a "postgres" -d "bety" -p "-h postgres -p 5432" -o bety -c -u -g -m ${LOCAL_SERVER} -r 0 -w https://ebi-forecast.igb.illinois.edu/pecan/dump/all/bety.tar.gz
         ;;
     "sync" )
         echo "Synchronize with servers ${REMOTE_SERVERS}"