Skip to content

Commit

Permalink
adempiere-docker#10 Create a best name for tenant and set license hea…
Browse files Browse the repository at this point in the history
…ders #10
  • Loading branch information
e-Evolution committed Aug 23, 2017
1 parent ddf34d2 commit 2202953
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 35 deletions.
27 changes: 27 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Copyright (C) 2010-2017, OpenUp S.A. , http://www.openup.com.uy
# Copyright (C) 2003-2017, e-Evolution Consultants S.A. , http://www.e-evolution.com
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Email: [email protected], http://openupsolutions.com , http://github.com/rcapecce
# Email: [email protected], http://www.e-evolution.com , http://github.com/e-Evolution
#

ADEMPIERE_VERSION=390LTS
ADEMPIERE_TENANT=tenant1
ADEMPIERE_DB_PORT=55432
ADEMPIERE_WEB_PORT=8277
ADEMPIERE_SSL_PORT=4445
ADEMPIERE_DB_SERVER=10.10.1.122
ADEMPIERE_APPS_SERVER=
ADEMPIERE_DB_USER=usertenant1
ADEMPIERE_DB_PASSWORD=adempiere
ADEMPIERE_DB_ADMIN_PASSWORD=postgres
ADEMPIERE_DB_INIT=Y
71 changes: 36 additions & 35 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ services:
volumes:
- data:/var/lib/postgresql/data/
ports:
- "54321:5432"
- "${ADEMPIERE_DB_PORT}:5432"
environment:
- POSTGRES_USER:postgres
- POSTGRES_PASSWORD:postgres
Expand All @@ -32,49 +32,50 @@ services:
- POSTGRES_INITDB_ARGS:''
- POSTGRES_INITDB_XLOGDIR:''

adempiere-tenant1:
adempiere-tenant:
depends_on:
- db
image: adempiere-tenant1
container_name: adempiere-tenant1
image: ${ADEMPIERE_TENANT}
container_name: ${ADEMPIERE_TENANT}
ports:
- 8273:8888
- ${ADEMPIERE_WEB_PORT}:8888
- ${ADEMPIERE_SSL_PORT}:444
environment:
ADEMPIERE_DB_INIT: Y
ADEMPIERE_DB_INIT: ${ADEMPIERE_DB_INIT}
build:
context: .
dockerfile: ./adempiere-last/Dockerfile
args:
ADEMPIERE_REL: 390LTS
ADEMPIERE_SRC_DIR: ./tenant1
ADEMPIERE_DB_HOST: 10.10.1.122
ADEMPIERE_DB_PORT: 54321
ADEMPIERE_DB_NAME: dbtenant1
ADEMPIERE_DB_USER: usertenant1
ADEMPIERE_DB_PASSWORD: postgres
ADEMPIERE_DB_ADMIN_PASSWORD: postgres
ADEMPIERE_REL: ${ADEMPIERE_VERSION}
ADEMPIERE_SRC_DIR: "./${ADEMPIERE_TENANT}"
ADEMPIERE_DB_HOST: ${ADEMPIERE_DB_SERVER}
ADEMPIERE_DB_PORT: ${ADEMPIERE_DB_PORT}
ADEMPIERE_DB_NAME: ${ADEMPIERE_TENANT}
ADEMPIERE_DB_USER: ${ADEMPIERE_DB_USER}
ADEMPIERE_DB_PASSWORD: ${ADEMPIERE_DB_PASSWORD}
ADEMPIERE_DB_ADMIN_PASSWORD: ${ADEMPIERE_DB_ADMIN_PASSWORD}

adempiere-tenant2:
depends_on:
- db
image: adempiere-tenant2
container_name: adempiere-tenant2
ports:
- 8274:8888
environment:
ADEMPIERE_DB_INIT: Y
build:
context: .
dockerfile: ./adempiere-last/Dockerfile
args:
ADEMPIERE_REL: 390LTS
ADEMPIERE_SRC_DIR: ./tenant2
ADEMPIERE_DB_HOST: 10.10.1.122
ADEMPIERE_DB_PORT: 54321
ADEMPIERE_DB_NAME: dbtenant2
ADEMPIERE_DB_USER: usertenant2
ADEMPIERE_DB_PASSWORD: postgres
ADEMPIERE_DB_ADMIN_PASSWORD: postgres
#adempiere-tenant2:
# depends_on:
# - db
# image: adempiere-tenant2
# container_name: adempiere-tenant2
# ports:
# - 8274:8888
# environment:
# ADEMPIERE_DB_INIT: Y
# build:
# context: .
# dockerfile: ./adempiere-last/Dockerfile
# args:
# ADEMPIERE_REL: 390LTS
# ADEMPIERE_SRC_DIR: ./tenant2
# ADEMPIERE_DB_HOST: 10.10.1.122
# ADEMPIERE_DB_PORT: 54321
# ADEMPIERE_DB_NAME: dbtenant2
# ADEMPIERE_DB_USER: usertenant2
# ADEMPIERE_DB_PASSWORD: postgres
# ADEMPIERE_DB_ADMIN_PASSWORD: postgres

volumes:
data: {}

0 comments on commit 2202953

Please sign in to comment.