diff --git a/contrib/scripts/install/docker.sh b/contrib/scripts/install/docker.sh index c20a4b89ac..7835dba430 100755 --- a/contrib/scripts/install/docker.sh +++ b/contrib/scripts/install/docker.sh @@ -16,7 +16,7 @@ set -e : ${DATABASE_USER:=mayan} : ${DATABASE_NAME:=mayan} : ${DATABASE_PASSWORD:=mayanuserpass} -: ${DOCKER_POSTGRES_IMAGE:=postgres:9.5} +: ${DOCKER_POSTGRES_IMAGE:=postgres:9.6} : ${DOCKER_POSTGRES_CONTAINER:=mayan-edms-postgres} : ${DOCKER_POSTGRES_VOLUME:=/docker-volumes/mayan-edms/postgres} : ${DOCKER_POSTGRES_PORT:=5432} diff --git a/docs/chapters/backups.rst b/docs/chapters/backups.rst index 9ea3bdb47e..5d65284308 100644 --- a/docs/chapters/backups.rst +++ b/docs/chapters/backups.rst @@ -59,7 +59,7 @@ Example:: -e POSTGRES_DB=mayan \ -e POSTGRES_PASSWORD=mayanuserpass \ -v /docker-volumes/mayan-edms/postgres-new:/var/lib/postgresql/data \ - -d postgres:9.5 + -d postgres:9.6 docker exec -i mayan-edms-pg-new pg_restore -U mayan -d mayan < 2018-06-07_17-09-34.dump diff --git a/docs/chapters/docker.rst b/docs/chapters/docker.rst index 88a63f6be9..2400a6696b 100644 --- a/docs/chapters/docker.rst +++ b/docs/chapters/docker.rst @@ -14,9 +14,9 @@ With Docker properly installed, proceed to download the Mayan EDMS image using t docker pull mayanedms/mayanedms: -Then download version 9.5 of the Docker PostgreSQL image:: +Then download version 9.6 of the Docker PostgreSQL image:: - docker pull postgres:9.5 + docker pull postgres:9.6 Create and run a PostgreSQL container:: @@ -28,7 +28,7 @@ Create and run a PostgreSQL container:: -e POSTGRES_DB=mayan \ -e POSTGRES_PASSWORD=mayanuserpass \ -v /docker-volumes/mayan-edms/postgres:/var/lib/postgresql/data \ - -d postgres:9.5 + -d postgres:9.6 The PostgreSQL container will have one database named ``mayan``, with an user named ``mayan`` too, with a password of ``mayanuserpass``. The container will @@ -91,7 +91,7 @@ binding (``-p 5432:5432``):: -e POSTGRES_DB=mayan \ -e POSTGRES_PASSWORD=mayanuserpass \ -v /docker-volumes/mayan-edms/postgres:/var/lib/postgresql/data \ - -d postgres:9.5 + -d postgres:9.6 Launch the Mayan EDMS container with the network option and change the database hostname to the PostgreSQL container name (``mayan-edms-postgres``)