- Add "ALTER DATABASE" in postsql to change database owner to POSTGRESQL_USER,
- Update env.dist & compose files to fully support docker_service_add Docker Tools function.
This commit is contained in:
41
compose.yaml
41
compose.yaml
@@ -1,35 +1,36 @@
|
||||
# Rx3-Docker/PostgreSQL Docker Image
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
name: ${IMG_NAME}
|
||||
name: ${DATABASE_IMG_NAME}
|
||||
|
||||
services:
|
||||
|
||||
database:
|
||||
container_name: ${IMG_NAME}
|
||||
hostname: ${IMG_NAME}
|
||||
|
||||
image: ${IMG_URL}
|
||||
container_name: ${DATABASE_IMG_NAME}
|
||||
hostname: ${DATABASE_IMG_NAME}
|
||||
|
||||
image: ${DATABASE_IMG_URL}
|
||||
|
||||
build:
|
||||
context: .
|
||||
args:
|
||||
IMG_NAME: ${IMG_NAME}
|
||||
IMG_NAME_FULL: ${IMG_NAME_FULL}
|
||||
IMG_VERSION: ${IMG_VERSION}
|
||||
IMG_MAINTAINER: ${IMG_MAINTAINER}
|
||||
IMG_FROM_URL: ${IMG_FROM_URL}
|
||||
IMG_NAME: ${DATABASE_IMG_NAME}
|
||||
IMG_NAME_FULL: ${DATABASE_IMG_NAME_FULL}
|
||||
IMG_VERSION: ${DATABASE_IMG_VERSION}
|
||||
IMG_MAINTAINER: ${DATABASE_IMG_MAINTAINER}
|
||||
IMG_FROM_URL: ${DATABASE_IMG_FROM_URL}
|
||||
|
||||
POSTGRESQL_LIB: ${DATABASE_LIB_DIR}
|
||||
POSTGRESQL_LOG: ${DATABASE_LOG_POSTGRES_DIR}
|
||||
POSTGRESQL_LIB: ${DATABASE_LIB_INT}
|
||||
POSTGRESQL_LOG: ${DATABASE_LOG_MAIN_INT}
|
||||
POSTGRESQL_PORT: ${DATABASE_PORT_MAIN_INT}
|
||||
POSTSQL_LOG_DIR: ${DATABASE_LOG_POSTSQL_DIR}
|
||||
POSTSQL_LOG_DIR: ${DATABASE_LOG_INIT_INT}
|
||||
|
||||
restart: unless-stopped
|
||||
|
||||
environment:
|
||||
POSTGRESQL_UID: ${POSTGRESQL_UID}
|
||||
POSTGRESQL_GID: ${POSTGRESQL_GID}
|
||||
POSTGRESQL_UID: ${DATABASE_USER_ID}
|
||||
POSTGRESQL_GID: ${DATABASE_GROUP_ID}
|
||||
|
||||
POSTGRESQL_POSTGRES_PASSWORD: ${POSTGRESQL_POSTGRES_PASSWORD}
|
||||
POSTGRESQL_DATABASE: ${POSTGRESQL_DATABASE}
|
||||
POSTGRESQL_USER: ${POSTGRESQL_USER}
|
||||
@@ -42,11 +43,11 @@ services:
|
||||
retries: 3
|
||||
|
||||
volumes:
|
||||
- ./var/lib/pgsql/data:${DATABASE_DATA_DIR}
|
||||
- ./var/log/init:${DATABASE_LOG_INIT_DIR}
|
||||
- ./var/log/supervisor:${DATABASE_LOG_SV_DIR}
|
||||
- ./var/log/postgres:${DATABASE_LOG_POSTGRES_DIR}
|
||||
|
||||
- ./${DATABASE_LIB_EXT}:${DATABASE_LIB_INT}
|
||||
- ./${DATABASE_LOG_INIT_EXT}:${DATABASE_LOG_INIT_INT}
|
||||
- ./${DATABASE_LOG_SV_EXT}:${DATABASE_LOG_SV_INT}
|
||||
- ./${DATABASE_LOG_MAIN_EXT}:${DATABASE_LOG_MAIN_INT}
|
||||
|
||||
ports:
|
||||
- "127.0.0.1:${DATABASE_PORT_SV_EXT}:${DATABASE_PORT_SV_INT}"
|
||||
- "127.0.0.1:${DATABASE_PORT_MAIN_EXT}:${DATABASE_PORT_MAIN_INT}"
|
||||
|
||||
Reference in New Issue
Block a user