accounting/frappe_docker
2
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2025-01-25 16:18:32 +00:00
Code Issues Releases Activity

Merge pull request #352 from tbolender/consistent-version-variables

Browse Source 
Use new version variables in compose files
This commit is contained in:
Revant Nandgaonkar 2020-09-23 22:36:58 +05:30 committed by GitHub
commit 47727b3897
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
env-example
View File

@ -1,4 +1,5 @@
VERSION=edge ERPNEXT_VERSION=edge
FRAPPE_VERSION=edge
MARIADB_HOST=mariadb MARIADB_HOST=mariadb
MYSQL_ROOT_PASSWORD=admin MYSQL_ROOT_PASSWORD=admin
SITES=your.domain.com SITES=your.domain.com

2
installation/docker-compose-custom.yml
View File

@ -46,7 +46,7 @@ services:
- assets-vol:/home/frappe/frappe-bench/sites/assets:rw - assets-vol:/home/frappe/frappe-bench/sites/assets:rw
frappe-socketio: frappe-socketio:
image: frappe/frappe-socketio:${VERSION} image: frappe/frappe-socketio:${FRAPPE_VERSION}
restart: on-failure restart: on-failure
depends_on: depends_on:
- redis-socketio - redis-socketio

14
installation/docker-compose-erpnext.yml
View File

@ -2,7 +2,7 @@ version: '3'
services: services:
erpnext-nginx: erpnext-nginx:
image: frappe/erpnext-nginx:${VERSION} image: frappe/erpnext-nginx:${ERPNEXT_VERSION}
restart: on-failure restart: on-failure
environment: environment:
- FRAPPE_PY=erpnext-python - FRAPPE_PY=erpnext-python
@ -29,7 +29,7 @@ services:
- assets-vol:/assets:rw - assets-vol:/assets:rw
erpnext-python: erpnext-python:
image: frappe/erpnext-worker:${VERSION} image: frappe/erpnext-worker:${ERPNEXT_VERSION}
restart: on-failure restart: on-failure
environment: environment:
- MARIADB_HOST=${MARIADB_HOST} - MARIADB_HOST=${MARIADB_HOST}
@ -43,7 +43,7 @@ services:
- assets-vol:/home/frappe/frappe-bench/sites/assets:rw - assets-vol:/home/frappe/frappe-bench/sites/assets:rw
frappe-socketio: frappe-socketio:
image: frappe/frappe-socketio:${VERSION} image: frappe/frappe-socketio:${FRAPPE_VERSION}
restart: on-failure restart: on-failure
depends_on: depends_on:
- redis-socketio - redis-socketio
@ -53,7 +53,7 @@ services:
- sites-vol:/home/frappe/frappe-bench/sites:rw - sites-vol:/home/frappe/frappe-bench/sites:rw
frappe-worker-default: frappe-worker-default:
image: frappe/erpnext-worker:${VERSION} image: frappe/erpnext-worker:${ERPNEXT_VERSION}
restart: on-failure restart: on-failure
command: worker command: worker
depends_on: depends_on:
@ -66,7 +66,7 @@ services:
- sites-vol:/home/frappe/frappe-bench/sites:rw - sites-vol:/home/frappe/frappe-bench/sites:rw
frappe-worker-short: frappe-worker-short:
image: frappe/erpnext-worker:${VERSION} image: frappe/erpnext-worker:${ERPNEXT_VERSION}
restart: on-failure restart: on-failure
command: worker command: worker
environment: environment:
@ -81,7 +81,7 @@ services:
- sites-vol:/home/frappe/frappe-bench/sites:rw - sites-vol:/home/frappe/frappe-bench/sites:rw
frappe-worker-long: frappe-worker-long:
image: frappe/erpnext-worker:${VERSION} image: frappe/erpnext-worker:${ERPNEXT_VERSION}
restart: on-failure restart: on-failure
command: worker command: worker
environment: environment:
@ -96,7 +96,7 @@ services:
- sites-vol:/home/frappe/frappe-bench/sites:rw - sites-vol:/home/frappe/frappe-bench/sites:rw
frappe-schedule: frappe-schedule:
image: frappe/erpnext-worker:${VERSION} image: frappe/erpnext-worker:${ERPNEXT_VERSION}
restart: on-failure restart: on-failure
command: schedule command: schedule
depends_on: depends_on:

14
installation/docker-compose-frappe.yml
View File

@ -2,7 +2,7 @@ version: '3'
services: services:
frappe-nginx: frappe-nginx:
image: frappe/frappe-nginx:${VERSION} image: frappe/frappe-nginx:${FRAPPE_VERSION}
restart: on-failure restart: on-failure
environment: environment:
- FRAPPE_PY=frappe-python - FRAPPE_PY=frappe-python
@ -29,7 +29,7 @@ services:
- assets-vol:/assets:rw - assets-vol:/assets:rw
frappe-python: frappe-python:
image: frappe/frappe-worker:${VERSION} image: frappe/frappe-worker:${FRAPPE_VERSION}
restart: on-failure restart: on-failure
environment: environment:
- MARIADB_HOST=${MARIADB_HOST} - MARIADB_HOST=${MARIADB_HOST}
@ -43,7 +43,7 @@ services:
- assets-vol:/home/frappe/frappe-bench/sites/assets:rw - assets-vol:/home/frappe/frappe-bench/sites/assets:rw
frappe-socketio: frappe-socketio:
image: frappe/frappe-socketio:${VERSION} image: frappe/frappe-socketio:${FRAPPE_VERSION}
restart: on-failure restart: on-failure
depends_on: depends_on:
- redis-socketio - redis-socketio
@ -53,7 +53,7 @@ services:
- sites-vol:/home/frappe/frappe-bench/sites:rw - sites-vol:/home/frappe/frappe-bench/sites:rw
frappe-worker-default: frappe-worker-default:
image: frappe/frappe-worker:${VERSION} image: frappe/frappe-worker:${FRAPPE_VERSION}
restart: on-failure restart: on-failure
command: worker command: worker
depends_on: depends_on:
@ -66,7 +66,7 @@ services:
- sites-vol:/home/frappe/frappe-bench/sites:rw - sites-vol:/home/frappe/frappe-bench/sites:rw
frappe-worker-short: frappe-worker-short:
image: frappe/frappe-worker:${VERSION} image: frappe/frappe-worker:${FRAPPE_VERSION}
restart: on-failure restart: on-failure
command: worker command: worker
environment: environment:
@ -81,7 +81,7 @@ services:
- sites-vol:/home/frappe/frappe-bench/sites:rw - sites-vol:/home/frappe/frappe-bench/sites:rw
frappe-worker-long: frappe-worker-long:
image: frappe/frappe-worker:${VERSION} image: frappe/frappe-worker:${FRAPPE_VERSION}
restart: on-failure restart: on-failure
command: worker command: worker
environment: environment:
@ -96,7 +96,7 @@ services:
- sites-vol:/home/frappe/frappe-bench/sites:rw - sites-vol:/home/frappe/frappe-bench/sites:rw
frappe-schedule: frappe-schedule:
image: frappe/frappe-worker:${VERSION} image: frappe/frappe-worker:${FRAPPE_VERSION}
restart: on-failure restart: on-failure
command: schedule command: schedule
depends_on: depends_on: