From bbb5d7c238a45016fb0f62ad16868068e63d2baa Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Sat, 10 Aug 2024 00:42:28 -0700 Subject: [PATCH] client: Dockerfiles: add `plugins` env to docker-compose --- client/Dockerfiles/finance/docker-compose.yml.archlinux.in | 5 ++++- client/Dockerfiles/finance/docker-compose.yml.ubuntu.in | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/client/Dockerfiles/finance/docker-compose.yml.archlinux.in b/client/Dockerfiles/finance/docker-compose.yml.archlinux.in index 7049de7..c4bfddc 100644 --- a/client/Dockerfiles/finance/docker-compose.yml.archlinux.in +++ b/client/Dockerfiles/finance/docker-compose.yml.archlinux.in @@ -27,20 +27,23 @@ services: volumes: - ${DOCKER_FINANCE_CLIENT_CONF}/container:${DOCKER_FINANCE_CONTAINER_CONF} - ${DOCKER_FINANCE_CLIENT_FLOW}:${DOCKER_FINANCE_CONTAINER_FLOW} + # Connects client-side (host) custom container plugins (not repo's container plugins) + - ${DOCKER_FINANCE_CLIENT_PLUGINS}/container:${DOCKER_FINANCE_CONTAINER_PLUGINS}:ro - ${DOCKER_FINANCE_CLIENT_REPO}/container:${DOCKER_FINANCE_CONTAINER_REPO}:ro - ${DOCKER_FINANCE_CLIENT_SHARED}:${DOCKER_FINANCE_CONTAINER_SHARED} # Needed for when upstream data is localtime instead of UTC # NOTE: although TZ can be used within the container, this *should* be more dynamic - /etc/localtime:/etc/localtime:ro environment: - - DOCKER_FINANCE_VERSION=@DOCKER_FINANCE_VERSION@ - DOCKER_FINANCE_CONTAINER_CMD=${DOCKER_FINANCE_CONTAINER_CMD} - DOCKER_FINANCE_CONTAINER_CONF=${DOCKER_FINANCE_CONTAINER_CONF} - DOCKER_FINANCE_CONTAINER_EDITOR=${DOCKER_FINANCE_CONTAINER_EDITOR} - DOCKER_FINANCE_CONTAINER_FLOW=${DOCKER_FINANCE_CONTAINER_FLOW} + - DOCKER_FINANCE_CONTAINER_PLUGINS=${DOCKER_FINANCE_CONTAINER_PLUGINS} - DOCKER_FINANCE_CONTAINER_REPO=${DOCKER_FINANCE_CONTAINER_REPO} - DOCKER_FINANCE_CONTAINER_SHARED=${DOCKER_FINANCE_CONTAINER_SHARED} - DOCKER_FINANCE_DEBUG=${DOCKER_FINANCE_DEBUG} + - DOCKER_FINANCE_VERSION=@DOCKER_FINANCE_VERSION@ - GID=${DOCKER_FINANCE_GID} - UID=${DOCKER_FINANCE_UID} # Container's view of client's hledger-flow (for logging purposes) diff --git a/client/Dockerfiles/finance/docker-compose.yml.ubuntu.in b/client/Dockerfiles/finance/docker-compose.yml.ubuntu.in index 0c41df8..ba21d19 100644 --- a/client/Dockerfiles/finance/docker-compose.yml.ubuntu.in +++ b/client/Dockerfiles/finance/docker-compose.yml.ubuntu.in @@ -27,20 +27,23 @@ services: volumes: - ${DOCKER_FINANCE_CLIENT_CONF}/container:${DOCKER_FINANCE_CONTAINER_CONF} - ${DOCKER_FINANCE_CLIENT_FLOW}:${DOCKER_FINANCE_CONTAINER_FLOW} + # Connects client-side (host) custom container plugins (not repo's container plugins) + - ${DOCKER_FINANCE_CLIENT_PLUGINS}/container:${DOCKER_FINANCE_CONTAINER_PLUGINS}:ro - ${DOCKER_FINANCE_CLIENT_REPO}/container:${DOCKER_FINANCE_CONTAINER_REPO}:ro - ${DOCKER_FINANCE_CLIENT_SHARED}:${DOCKER_FINANCE_CONTAINER_SHARED} # Needed for when upstream data is localtime instead of UTC # NOTE: although TZ can be used within the container, this should be more dynamic - /etc/localtime:/etc/localtime:ro environment: - - DOCKER_FINANCE_VERSION=@DOCKER_FINANCE_VERSION@ - DOCKER_FINANCE_CONTAINER_CMD=${DOCKER_FINANCE_CONTAINER_CMD} - DOCKER_FINANCE_CONTAINER_CONF=${DOCKER_FINANCE_CONTAINER_CONF} - DOCKER_FINANCE_CONTAINER_EDITOR=${DOCKER_FINANCE_CONTAINER_EDITOR} - DOCKER_FINANCE_CONTAINER_FLOW=${DOCKER_FINANCE_CONTAINER_FLOW} + - DOCKER_FINANCE_CONTAINER_PLUGINS=${DOCKER_FINANCE_CONTAINER_PLUGINS} - DOCKER_FINANCE_CONTAINER_REPO=${DOCKER_FINANCE_CONTAINER_REPO} - DOCKER_FINANCE_CONTAINER_SHARED=${DOCKER_FINANCE_CONTAINER_SHARED} - DOCKER_FINANCE_DEBUG=${DOCKER_FINANCE_DEBUG} + - DOCKER_FINANCE_VERSION=@DOCKER_FINANCE_VERSION@ - GID=${DOCKER_FINANCE_GID} - UID=${DOCKER_FINANCE_UID} # Container's view of client's hledger-flow (for logging purposes)