matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use Docker Alpine variants

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2019-10-30 20:02:50 -04:00
parent 6dff3564dc
commit 1e4088c819
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docker/docker-compose.yml
View File

@@ -18,8 +18,8 @@ services:
# Enable to use RabbitMQ # Enable to use RabbitMQ
# MAYAN_CELERY_BROKER_URL: amqp://mayan:mayanrabbitpass@broker:5672/mayan # MAYAN_CELERY_BROKER_URL: amqp://mayan:mayanrabbitpass@broker:5672/mayan
# Disable Redis Broker to use RabbitMQ as Broker # Disable Redis Broker to use RabbitMQ as Broker
MAYAN_CELERY_BROKER_URL: redis://redis:6379/1 MAYAN_CELERY_BROKER_URL: redis://redis:6379/0
MAYAN_CELERY_RESULT_BACKEND: 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'}}" MAYAN_DATABASES: "{'default':{'ENGINE':'django.db.backends.postgresql','NAME':'mayan','PASSWORD':'mayandbpass','USER':'mayan','HOST':'postgresql'}}"
image: mayanedms/mayanedms:3.3 image: mayanedms/mayanedms:3.3
networks: networks:
@@ -35,7 +35,7 @@ services:
POSTGRES_DB: mayan POSTGRES_DB: mayan
POSTGRES_PASSWORD: mayandbpass POSTGRES_PASSWORD: mayandbpass
POSTGRES_USER: mayan POSTGRES_USER: mayan
image: postgres:9.6 image: postgres:9.6-alpine
networks: networks:
- mayan-bridge - mayan-bridge
restart: unless-stopped restart: unless-stopped
@@ -51,7 +51,7 @@ services:
- allkeys-lru - allkeys-lru
- --save - --save
- "" - ""
image: redis:5.0 image: redis:5.0-alpine
networks: networks:
- mayan-bridge - mayan-bridge
restart: unless-stopped restart: unless-stopped

6
docs/chapters/docker.rst
View File

@@ -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:: 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:: Create and run a PostgreSQL container::
@@ -35,7 +35,7 @@ Create and run a PostgreSQL container::
-e POSTGRES_DB=mayan \ -e POSTGRES_DB=mayan \
-e POSTGRES_PASSWORD=mayanuserpass \ -e POSTGRES_PASSWORD=mayanuserpass \
-v /docker-volumes/mayan-edms/postgres:/var/lib/postgresql/data \ -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 The PostgreSQL container will have one database named ``mayan``, with an user
named ``mayan`` too, with a password of ``mayanuserpass``. The container will 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_DB=mayan \
-e POSTGRES_PASSWORD=mayanuserpass \ -e POSTGRES_PASSWORD=mayanuserpass \
-v /docker-volumes/mayan-edms/postgres:/var/lib/postgresql/data \ -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 Launch the Mayan EDMS container with the network option and change the
database hostname to the PostgreSQL container name (``mayan-edms-postgres``) database hostname to the PostgreSQL container name (``mayan-edms-postgres``)