From 1e4088c819d77dddf6e40cc20b42259bee4c69a6 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 30 Oct 2019 20:02:50 -0400 Subject: [PATCH] Use Docker Alpine variants Signed-off-by: Roberto Rosario --- docker/docker-compose.yml | 8 ++++---- docs/chapters/docker.rst | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 01eee3ed5c..ba9c21140f 100755 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -18,8 +18,8 @@ services: # Enable to use RabbitMQ # MAYAN_CELERY_BROKER_URL: amqp://mayan:mayanrabbitpass@broker:5672/mayan # Disable Redis Broker to use RabbitMQ as Broker - MAYAN_CELERY_BROKER_URL: redis://redis:6379/1 - MAYAN_CELERY_RESULT_BACKEND: redis://redis:6379/0 + MAYAN_CELERY_BROKER_URL: redis://redis:6379/0 + MAYAN_CELERY_RESULT_BACKEND: redis://redis:6379/1 MAYAN_DATABASES: "{'default':{'ENGINE':'django.db.backends.postgresql','NAME':'mayan','PASSWORD':'mayandbpass','USER':'mayan','HOST':'postgresql'}}" image: mayanedms/mayanedms:3.3 networks: @@ -35,7 +35,7 @@ services: POSTGRES_DB: mayan POSTGRES_PASSWORD: mayandbpass POSTGRES_USER: mayan - image: postgres:9.6 + image: postgres:9.6-alpine networks: - mayan-bridge restart: unless-stopped @@ -51,7 +51,7 @@ services: - allkeys-lru - --save - "" - image: redis:5.0 + image: redis:5.0-alpine networks: - mayan-bridge restart: unless-stopped diff --git a/docs/chapters/docker.rst b/docs/chapters/docker.rst index 9862154e19..401ea472d1 100644 --- a/docs/chapters/docker.rst +++ b/docs/chapters/docker.rst @@ -23,7 +23,7 @@ tag here, remember to do so in the next steps also.:: Then download version 9.6 of the Docker PostgreSQL image:: - docker pull postgres:9.6 + docker pull postgres:9.6-alpine Create and run a PostgreSQL container:: @@ -35,7 +35,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.6 + -d postgres:9.6-alpine The PostgreSQL container will have one database named ``mayan``, with an user named ``mayan`` too, with a password of ``mayanuserpass``. The container will @@ -92,7 +92,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.6 + -d postgres:9.6-alpine Launch the Mayan EDMS container with the network option and change the database hostname to the PostgreSQL container name (``mayan-edms-postgres``)