From 1aa27ae099c4fb4f91d65fb5061ee2f56779a0ac Mon Sep 17 00:00:00 2001 From: inDane Date: Mon, 6 Jul 2026 17:18:57 +0200 Subject: [PATCH 1/3] feat: parameterize Docker images in docker-compose-local.yml --- .examples/docker/.env | 9 +++++++++ .examples/docker/docker-compose-local.yml | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 .examples/docker/.env diff --git a/.examples/docker/.env b/.examples/docker/.env new file mode 100644 index 0000000..d415aef --- /dev/null +++ b/.examples/docker/.env @@ -0,0 +1,9 @@ +########################## +# Image Repo Configuration +########################## +# +# optional Image Configuration +#LB_APP_DOCKER_IMAGE=librebooking/librebooking +#LB_APP_DOCKER_TAG=5.2.0 +#LB_DB_DOCKER_IMAGE=linuxserver/mariadb +#LB_DB_DOCKER_TAG:10.6.13 diff --git a/.examples/docker/docker-compose-local.yml b/.examples/docker/docker-compose-local.yml index 9c713ca..c12510b 100644 --- a/.examples/docker/docker-compose-local.yml +++ b/.examples/docker/docker-compose-local.yml @@ -2,14 +2,14 @@ name: librebooking services: db: - image: linuxserver/mariadb:10.6.13 + image: ${LB_DB_DOCKER_IMAGE:-linuxserver/mariadb}:${LB_DB_DOCKER_TAG:-10.6.13} restart: always volumes: - db_conf:/config env_file: - db.env app: - image: librebooking/librebooking:develop + image: ${LB_APP_DOCKER_IMAGE:-librebooking/librebooking}:${LB_APP_DOCKER_TAG:-develop} restart: always depends_on: - db @@ -22,7 +22,7 @@ services: env_file: - lb.env cron: - image: librebooking/librebooking:develop + image: ${LB_APP_DOCKER_IMAGE:-librebooking/librebooking}:${LB_APP_DOCKER_TAG:-develop} restart: always command: supercronic /config/lb-jobs-cron depends_on: From 899b0adde11dca0fdbeb649f7f66e8619c9136dc Mon Sep 17 00:00:00 2001 From: inDane Date: Mon, 6 Jul 2026 17:18:57 +0200 Subject: [PATCH 2/3] feat: parameterize Docker images in docker-compose-public.yml --- .examples/docker/.env | 14 ++++++++++++++ .examples/docker/docker-compose-local.yml | 6 +++--- .examples/docker/docker-compose-public.yml | 10 +++++----- 3 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 .examples/docker/.env diff --git a/.examples/docker/.env b/.examples/docker/.env new file mode 100644 index 0000000..7a4158f --- /dev/null +++ b/.examples/docker/.env @@ -0,0 +1,14 @@ +########################## +# Image Repo Configuration +########################## +# +# optional Image Configuration +#LB_APP_DOCKER_IMAGE=librebooking/librebooking +#LB_APP_DOCKER_TAG=5.2.0 +#LB_DB_DOCKER_IMAGE=linuxserver/mariadb +#LB_DB_DOCKER_TAG:10.6.13 + +#LB_PROXY_DOCKER_IMAGE=nginxproxy/nginx-proxy +#LB_PROXY_DOCKER_TAG:latest +#LB_ACME_DOCKER_IMAGE=nginxproxy/acme-companion +#LB_ACME_DOCKER_TAG:latest diff --git a/.examples/docker/docker-compose-local.yml b/.examples/docker/docker-compose-local.yml index 9c713ca..c12510b 100644 --- a/.examples/docker/docker-compose-local.yml +++ b/.examples/docker/docker-compose-local.yml @@ -2,14 +2,14 @@ name: librebooking services: db: - image: linuxserver/mariadb:10.6.13 + image: ${LB_DB_DOCKER_IMAGE:-linuxserver/mariadb}:${LB_DB_DOCKER_TAG:-10.6.13} restart: always volumes: - db_conf:/config env_file: - db.env app: - image: librebooking/librebooking:develop + image: ${LB_APP_DOCKER_IMAGE:-librebooking/librebooking}:${LB_APP_DOCKER_TAG:-develop} restart: always depends_on: - db @@ -22,7 +22,7 @@ services: env_file: - lb.env cron: - image: librebooking/librebooking:develop + image: ${LB_APP_DOCKER_IMAGE:-librebooking/librebooking}:${LB_APP_DOCKER_TAG:-develop} restart: always command: supercronic /config/lb-jobs-cron depends_on: diff --git a/.examples/docker/docker-compose-public.yml b/.examples/docker/docker-compose-public.yml index 5f3a339..a0a01f3 100644 --- a/.examples/docker/docker-compose-public.yml +++ b/.examples/docker/docker-compose-public.yml @@ -2,7 +2,7 @@ name: librebooking services: proxy: - image: nginxproxy/nginx-proxy + image: ${LB_PROXY_DOCKER_IMAGE:-nginxproxy/nginx-proxy}:${LB_PROXY_DOCKER_TAG:-latest} restart: always ports: - 80:80 @@ -12,7 +12,7 @@ services: - proxy_html:/usr/share/nginx/html - /var/run/docker.sock:/tmp/docker.sock:ro acme: - image: nginxproxy/acme-companion + image: ${LB_ACME_DOCKER_IMAGE:-nginxproxy/acme-companion}:${LB_ACME_DOCKER_TAG:-latest} restart: always depends_on: - proxy @@ -24,7 +24,7 @@ services: environment: - DEFAULT_EMAIL=john.doe@acme.org db: - image: linuxserver/mariadb:10.6.13 + image: ${LB_DB_DOCKER_IMAGE:-linuxserver/mariadb}:${LB_DB_DOCKER_TAG:-10.6.13} restart: always volumes: - db_conf:/config @@ -33,7 +33,7 @@ services: env_file: - db.env app: - image: librebooking/librebooking:develop + image: ${LB_APP_DOCKER_IMAGE:-librebooking/librebooking}:${LB_APP_DOCKER_TAG:-develop} restart: always depends_on: - db @@ -49,7 +49,7 @@ services: - VIRTUAL_PORT=8080 - LETSENCRYPT_HOST=acme.org cron: - image: librebooking/librebooking:develop + image: ${LB_APP_DOCKER_IMAGE:-librebooking/librebooking}:${LB_APP_DOCKER_TAG:-develop} restart: always depends_on: - app From 9ae3167d437bdb77a57d0a8954ebf979a0731ba1 Mon Sep 17 00:00:00 2001 From: inDane Date: Wed, 8 Jul 2026 12:01:41 +0200 Subject: [PATCH 3/3] refactored env vars from LB_ to CONTAINER_ --- .examples/docker/.env | 16 ++++++++-------- .examples/docker/docker-compose-local.yml | 6 +++--- .examples/docker/docker-compose-public.yml | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.examples/docker/.env b/.examples/docker/.env index 7a4158f..d3db96d 100644 --- a/.examples/docker/.env +++ b/.examples/docker/.env @@ -3,12 +3,12 @@ ########################## # # optional Image Configuration -#LB_APP_DOCKER_IMAGE=librebooking/librebooking -#LB_APP_DOCKER_TAG=5.2.0 -#LB_DB_DOCKER_IMAGE=linuxserver/mariadb -#LB_DB_DOCKER_TAG:10.6.13 +#CONTAINER_APP_DOCKER_IMAGE=librebooking/librebooking +#CONTAINER_APP_DOCKER_TAG=5.2.0 +#CONTAINER_DB_DOCKER_IMAGE=linuxserver/mariadb +#CONTAINER_DB_DOCKER_TAG:10.6.13 -#LB_PROXY_DOCKER_IMAGE=nginxproxy/nginx-proxy -#LB_PROXY_DOCKER_TAG:latest -#LB_ACME_DOCKER_IMAGE=nginxproxy/acme-companion -#LB_ACME_DOCKER_TAG:latest +#CONTAINER_PROXY_DOCKER_IMAGE=nginxproxy/nginx-proxy +#CONTAINER_PROXY_DOCKER_TAG:latest +#CONTAINER_ACME_DOCKER_IMAGE=nginxproxy/acme-companion +#CONTAINER_ACME_DOCKER_TAG:latest diff --git a/.examples/docker/docker-compose-local.yml b/.examples/docker/docker-compose-local.yml index c12510b..f5c876d 100644 --- a/.examples/docker/docker-compose-local.yml +++ b/.examples/docker/docker-compose-local.yml @@ -2,14 +2,14 @@ name: librebooking services: db: - image: ${LB_DB_DOCKER_IMAGE:-linuxserver/mariadb}:${LB_DB_DOCKER_TAG:-10.6.13} + image: ${CONTAINER_DB_DOCKER_IMAGE:-linuxserver/mariadb}:${CONTAINER_DB_DOCKER_TAG:-10.6.13} restart: always volumes: - db_conf:/config env_file: - db.env app: - image: ${LB_APP_DOCKER_IMAGE:-librebooking/librebooking}:${LB_APP_DOCKER_TAG:-develop} + image: ${CONTAINER_APP_DOCKER_IMAGE:-librebooking/librebooking}:${CONTAINER_APP_DOCKER_TAG:-develop} restart: always depends_on: - db @@ -22,7 +22,7 @@ services: env_file: - lb.env cron: - image: ${LB_APP_DOCKER_IMAGE:-librebooking/librebooking}:${LB_APP_DOCKER_TAG:-develop} + image: ${CONTAINER_APP_DOCKER_IMAGE:-librebooking/librebooking}:${CONTAINER_APP_DOCKER_TAG:-develop} restart: always command: supercronic /config/lb-jobs-cron depends_on: diff --git a/.examples/docker/docker-compose-public.yml b/.examples/docker/docker-compose-public.yml index a0a01f3..6be8b7f 100644 --- a/.examples/docker/docker-compose-public.yml +++ b/.examples/docker/docker-compose-public.yml @@ -2,7 +2,7 @@ name: librebooking services: proxy: - image: ${LB_PROXY_DOCKER_IMAGE:-nginxproxy/nginx-proxy}:${LB_PROXY_DOCKER_TAG:-latest} + image: ${CONTAINER_PROXY_DOCKER_IMAGE:-nginxproxy/nginx-proxy}:${CONTAINER_PROXY_DOCKER_TAG:-latest} restart: always ports: - 80:80 @@ -12,7 +12,7 @@ services: - proxy_html:/usr/share/nginx/html - /var/run/docker.sock:/tmp/docker.sock:ro acme: - image: ${LB_ACME_DOCKER_IMAGE:-nginxproxy/acme-companion}:${LB_ACME_DOCKER_TAG:-latest} + image: ${CONTAINER_ACME_DOCKER_IMAGE:-nginxproxy/acme-companion}:${CONTAINER_ACME_DOCKER_TAG:-latest} restart: always depends_on: - proxy @@ -24,7 +24,7 @@ services: environment: - DEFAULT_EMAIL=john.doe@acme.org db: - image: ${LB_DB_DOCKER_IMAGE:-linuxserver/mariadb}:${LB_DB_DOCKER_TAG:-10.6.13} + image: ${CONTAINER_DB_DOCKER_IMAGE:-linuxserver/mariadb}:${CONTAINER_DB_DOCKER_TAG:-10.6.13} restart: always volumes: - db_conf:/config @@ -33,7 +33,7 @@ services: env_file: - db.env app: - image: ${LB_APP_DOCKER_IMAGE:-librebooking/librebooking}:${LB_APP_DOCKER_TAG:-develop} + image: ${CONTAINER_APP_DOCKER_IMAGE:-librebooking/librebooking}:${CONTAINER_APP_DOCKER_TAG:-develop} restart: always depends_on: - db @@ -49,7 +49,7 @@ services: - VIRTUAL_PORT=8080 - LETSENCRYPT_HOST=acme.org cron: - image: ${LB_APP_DOCKER_IMAGE:-librebooking/librebooking}:${LB_APP_DOCKER_TAG:-develop} + image: ${CONTAINER_APP_DOCKER_IMAGE:-librebooking/librebooking}:${CONTAINER_APP_DOCKER_TAG:-develop} restart: always depends_on: - app