From 13c730eaadb25c8305a8f42ccc4321d5da921892 Mon Sep 17 00:00:00 2001
From: Sylvain <bond.never.die@gmail.com>
Date: Wed, 9 Oct 2019 09:52:58 +0200
Subject: [PATCH] use postgres 9.6 instead of 11

---
 CHANGELOG.md               | 2 +-
 README.md                  | 8 ++++----
 doc/postgres_upgrade.md    | 4 ++--
 docker/docker-compose.yml  | 2 +-
 scripts/postgre-upgrade.sh | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce5cdf74c..fbc2ecadd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog Fab Manager
 
-- Upgraded PostgreSQL from 9.4 to 11
+- Upgraded PostgreSQL from 9.4 to 9.6
 - Optional reCaptcha checkbox in sign-up form
 - Ability to configure and export the accounting data to the ACD accounting software
 - Compute the VAT per item in each invoices, instead of globally
diff --git a/README.md b/README.md
index 23f4c71a3..7e69503e8 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ FabManager is the Fab Lab management solution. It provides a comprehensive, web-
 4. [Setup a development environment](#setup-a-development-environment)<br/>
 4.1. [General Guidelines](#general-guidelines)<br/>
 5. [PostgreSQL](#postgresql)<br/>
-5.1. [Install PostgreSQL 9.4](#setup-postgresql)
+5.1. [Install PostgreSQL 9.6](#setup-postgresql)
 6. [ElasticSearch](#elasticsearch)<br/>
 6.1. [Install ElasticSearch](#setup-elasticsearch)<br/>
 6.2. [Rebuild statistics](#rebuild-stats)<br/>
@@ -43,7 +43,7 @@ FabManager is a Ruby on Rails / AngularJS web application that runs on the follo
 - Redis 2.8.4+
 - Sidekiq 3.3.4+
 - Elasticsearch 5.6
-- PostgreSQL 9.4
+- PostgreSQL 9.6
 
 <a name="contributing"></a>
 ## Contributing
@@ -193,7 +193,7 @@ Optionally, you can use a virtual development environment that relies on Vagrant
 ## PostgreSQL
 
 <a name="setup-postgresql"></a>
-### Install PostgreSQL 9.4
+### Install PostgreSQL 9.6
 
 We will use docker to easily install the required version of PostgreSQL.
 
@@ -208,7 +208,7 @@ We will use docker to easily install the required version of PostgreSQL.
    -v $(pwd)/.docker/postgresql:/var/lib/postgresql/data \
    --network fabmanager --ip 172.18.0.2 \
    -p 5432:5432 \
-   postgres:9.4
+   postgres:9.6
    ```
 
 3. Configure fab-manager to use it.
diff --git a/doc/postgres_upgrade.md b/doc/postgres_upgrade.md
index e267236b0..3a717c173 100644
--- a/doc/postgres_upgrade.md
+++ b/doc/postgres_upgrade.md
@@ -2,7 +2,7 @@
 
 ## Automatic upgrade
 
-Fab-manager release 4.2.0 has upgraded its dependency to PostgreSQL from version 9.4 to version 11 as the previous won't be maintained from from february 2020.
+Fab-manager release 4.2.0 has upgraded its dependency to PostgreSQL from version 9.4 to version 9.6 as the previous won't be maintained from from february 2020.
 To keep using fab-manager you need to upgrade your installation with the new version.
 We've wrote a script to automate the process while keeping your data integrity, but there's some requirements to understand before running it.
 
@@ -25,4 +25,4 @@ cd /apps/fabmanager
 
 For instructions regarding a manual upgrade, please refer to the official documentation:
 
-- https://www.postgresql.org/docs/11/upgrading.html
+- https://www.postgresql.org/docs/9.6/upgrading.html
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 59d853f6d..9cb5fcf1c 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -23,7 +23,7 @@ services:
     restart: always
 
   postgres:
-    image: postgres:9.4
+    image: postgres:9.6
     volumes:
       - ${PWD}/postgresql:/var/lib/postgresql/data
     restart: always
diff --git a/scripts/postgre-upgrade.sh b/scripts/postgre-upgrade.sh
index 211e7f1c3..7bd1a2b3f 100644
--- a/scripts/postgre-upgrade.sh
+++ b/scripts/postgre-upgrade.sh
@@ -93,7 +93,7 @@ pg_upgrade()
 {
   docker run --rm \
     -v "$PG_PATH:/var/lib/postgresql/$OLD/data" \
-    -v "$PG_PATH-$NEW:/var/lib/postgresql/$NEW/data" \
+    -v "$NEW_PATH:/var/lib/postgresql/$NEW/data" \
     "tianon/postgres-upgrade:$OLD-to-$NEW" --link
 
 }
@@ -129,7 +129,7 @@ upgrade_postgres()
   if [[ "$confirm" = "y" ]]
   then
     OLD='9.4'
-    NEW='11'
+    NEW='9.6'
     read_path
     test_free_space
     prepare_path