From c3871a09a8d7adf5e30d3f0de59c300080855cab Mon Sep 17 00:00:00 2001 From: Robin Alexander Date: Thu, 9 Jul 2026 16:23:46 +0200 Subject: [PATCH 1/5] Do not copy the uoloads directory at the tree root --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 0f94194..66067a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,6 +51,7 @@ COPY --from=supercronic \ COPY --from=upstream \ --chown=www-data:root --chmod=0775 \ --exclude=.git* \ + --exclude=uploads \ /upstream/ /var/www/html/ # Customize the system environment From be1816bbc4634778a019b3826a7453aebff936ce Mon Sep 17 00:00:00 2001 From: Robin Alexander Date: Thu, 9 Jul 2026 16:27:39 +0200 Subject: [PATCH 2/5] Drop some environment variables from examples --- .examples/docker/lb.env | 2 -- .examples/docker/lb1.env | 2 -- .examples/docker/lb2.env | 2 -- .examples/podman/lb.env | 2 -- 4 files changed, 8 deletions(-) diff --git a/.examples/docker/lb.env b/.examples/docker/lb.env index 21d825f..9ed1d9b 100644 --- a/.examples/docker/lb.env +++ b/.examples/docker/lb.env @@ -7,5 +7,3 @@ LB_LOGGING_FOLDER=/var/log/librebooking LB_LOGGING_LEVEL=DEBUG LB_LOGGING_SQL=false LB_DEFAULT_TIMEZONE=Europe/Zurich -LB_UPLOADS_IMAGE_UPLOAD_URL=Web/uploads/images -LB_UPLOADS_RESERVATION_ATTACHMENT_PATH=Web/uploads/reservation diff --git a/.examples/docker/lb1.env b/.examples/docker/lb1.env index 920fa5b..70b9365 100644 --- a/.examples/docker/lb1.env +++ b/.examples/docker/lb1.env @@ -7,5 +7,3 @@ LB_LOGGING_FOLDER=/var/log/librebooking LB_LOGGING_LEVEL=ERROR LB_LOGGING_SQL=false LB_DEFAULT_TIMEZONE=Europe/Zurich -LB_UPLOADS_IMAGE_UPLOAD_URL=Web/uploads/images -LB_UPLOADS_RESERVATION_ATTACHMENT_PATH=Web/uploads/reservation \ No newline at end of file diff --git a/.examples/docker/lb2.env b/.examples/docker/lb2.env index 7ca82a0..92ac4d1 100644 --- a/.examples/docker/lb2.env +++ b/.examples/docker/lb2.env @@ -7,5 +7,3 @@ LB_LOGGING_FOLDER=/var/log/librebooking LB_LOGGING_LEVEL=ERROR LB_LOGGING_SQL=false LB_DEFAULT_TIMEZONE=Europe/Zurich -LB_UPLOADS_IMAGE_UPLOAD_URL=Web/uploads/images -LB_UPLOADS_RESERVATION_ATTACHMENT_PATH=Web/uploads/reservation \ No newline at end of file diff --git a/.examples/podman/lb.env b/.examples/podman/lb.env index 070dc7a..c495dde 100644 --- a/.examples/podman/lb.env +++ b/.examples/podman/lb.env @@ -7,5 +7,3 @@ LB_LOGGING_FOLDER=/var/log/librebooking LB_LOGGING_LEVEL=DEBUG LB_LOGGING_SQL=false LB_DEFAULT_TIMEZONE=Europe/Zurich -LB_UPLOADS_IMAGE_UPLOAD_URL=Web/uploads/images -LB_UPLOADS_RESERVATION_ATTACHMENT_PATH=Web/uploads/reservation From fef8c6bf6bb7036c36ba26445edb52e9676f8326 Mon Sep 17 00:00:00 2001 From: Robin Alexander Date: Fri, 10 Jul 2026 10:59:39 +0200 Subject: [PATCH 3/5] Revert 'Do not copy the uploads directory at the tree root' --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 66067a3..0f94194 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,7 +51,6 @@ COPY --from=supercronic \ COPY --from=upstream \ --chown=www-data:root --chmod=0775 \ --exclude=.git* \ - --exclude=uploads \ /upstream/ /var/www/html/ # Customize the system environment From f21be90fb5946ef0207f9fc5459fcfac45a5dc75 Mon Sep 17 00:00:00 2001 From: Robin Alexander Date: Thu, 16 Jul 2026 16:28:39 +0200 Subject: [PATCH 4/5] Review documentation and environment files --- .examples/docker/lb.env | 2 ++ .examples/docker/lb1.env | 2 ++ .examples/docker/lb2.env | 1 + RUN.md | 7 ++++--- SETUP.md | 6 +++--- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.examples/docker/lb.env b/.examples/docker/lb.env index 9ed1d9b..49dd185 100644 --- a/.examples/docker/lb.env +++ b/.examples/docker/lb.env @@ -7,3 +7,5 @@ LB_LOGGING_FOLDER=/var/log/librebooking LB_LOGGING_LEVEL=DEBUG LB_LOGGING_SQL=false LB_DEFAULT_TIMEZONE=Europe/Zurich +LB_SCRIPT_URL=http://localhost:8080/Web + diff --git a/.examples/docker/lb1.env b/.examples/docker/lb1.env index 70b9365..0e49511 100644 --- a/.examples/docker/lb1.env +++ b/.examples/docker/lb1.env @@ -7,3 +7,5 @@ LB_LOGGING_FOLDER=/var/log/librebooking LB_LOGGING_LEVEL=ERROR LB_LOGGING_SQL=false LB_DEFAULT_TIMEZONE=Europe/Zurich +LB_SCRIPT_URL=https://acme.org/Web + diff --git a/.examples/docker/lb2.env b/.examples/docker/lb2.env index 92ac4d1..473d9ed 100644 --- a/.examples/docker/lb2.env +++ b/.examples/docker/lb2.env @@ -7,3 +7,4 @@ LB_LOGGING_FOLDER=/var/log/librebooking LB_LOGGING_LEVEL=ERROR LB_LOGGING_SQL=false LB_DEFAULT_TIMEZONE=Europe/Zurich +LB_SCRIPT_URL=https://acme.org/Web diff --git a/RUN.md b/RUN.md index 64fb0a0..e521549 100644 --- a/RUN.md +++ b/RUN.md @@ -18,15 +18,16 @@ From version-3, this docker image makes full usage of the | LB_DATABASE_HOSTSPEC | | Database network address | | LB_INSTALL_PASSWORD | | Librebooking installation password | | LB_DEFAULT_TIMEZONE | | Timezone | +| LB_SCRIPT_URL | | Script URL such as `http://localhost:8080/Web` | | LB_LOGGING_FOLDER | `/var/log/librebooking` | Logs folder | | LB_LOGGING_LEVEL | `none` | Logging level | | LB_LOGGING_SQL | `false` | SQL logging | ### Optional variables -| Variable | Description | -| -------- | ----------- | -| APP_PATH | URL path | +| Variable | Description | +| -------- | --------------- | +| APP_PATH | custom URL path | ## Optional mounts diff --git a/SETUP.md b/SETUP.md index 2739b95..6015fae 100644 --- a/SETUP.md +++ b/SETUP.md @@ -5,10 +5,10 @@ ### Database initialization 1. Point your web browser to `/install` or `//install` -(if you are using a custom URL-path) - - Enter the installation password (docker variable `LB_INSTALL_PWD`) +(if you are using a custom URL-path with environment variable `APP_PATH`) + - Enter the installation password (environment variable `LB_INSTALL_PWD`) - Enter the database root user: `root` - - Enter the database root password (docker variable `MYSQL_ROOT_PASSWORD`) + - Enter the database root password (environment variable `MYSQL_ROOT_PASSWORD`) - Select `Create the database` - Select `Create the database user` - Click on the register link, at the bottom of the web page From f268bf73fc9a1d7ce5778bb6b7aebd93d358f3e2 Mon Sep 17 00:00:00 2001 From: Robin Alexander Date: Thu, 16 Jul 2026 16:31:20 +0200 Subject: [PATCH 5/5] Add environment file proxy.env to docker-compose-public.yml --- .examples/docker/docker-compose-public.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.examples/docker/docker-compose-public.yml b/.examples/docker/docker-compose-public.yml index a0b10ea..0cd4db6 100644 --- a/.examples/docker/docker-compose-public.yml +++ b/.examples/docker/docker-compose-public.yml @@ -11,6 +11,8 @@ services: - proxy_certs:/etc/nginx/certs - proxy_html:/usr/share/nginx/html - /var/run/docker.sock:/tmp/docker.sock:ro + env_file: + - proxy.env acme: image: ${DOCKER_ACME_IMAGE:-nginxproxy/acme-companion}:${DOCKER_ACME_TAG:-latest} restart: always