fix: convert from long `RUN` statements to a `setup.sh` script by JohnVillalovos · Pull Request #173 · LibreBooking/docker

JohnVillalovos · 2026-03-08T14:50:20Z

Convert the multiple RUN statements into a setup.sh bash script.

Add a CI job to check the shell scripts.
Resolve shellcheck issues with bin/*.sh
Run shfmt -i 2 -ci -w bin/*sh

Copilot

Pull request overview

Removes the Dockerfile-level SHELL override (to avoid relying on a non-OCI instruction) and instead makes the heredoc RUN blocks explicitly run under bash, preserving pipefail behavior within those scripts.

Changes:

Removed SHELL ["/bin/bash", "-o", "pipefail", "-c"] from the Dockerfile.
Updated heredoc RUN blocks to invoke bash directly and set -o pipefail via set -xeuo pipefail.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

You can also share your feedback on Copilot code review. Take the survey.

Dockerfile

Convert the multiple `RUN` statements into a `setup.sh` bash script. Add a CI job to check the shell scripts.

Copilot

Pull request overview

Copilot reviewed 3 out of 5 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

You can also share your feedback on Copilot code review. Take the survey.

Dockerfile

JohnVillalovos · 2026-03-08T16:47:07Z

~~@colisee Do you prefer 2 space indents in bash files? I usually use 4, but I notice 'shfmt -i 4' caused a lot of changes.~~

Since most (but not all) was using 2 space indents I did that. And added a header to the files so that editors would know.

Copilot

Pull request overview

Copilot reviewed 3 out of 5 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

You can also share your feedback on Copilot code review. Take the survey.

Copilot · 2026-03-08T16:50:06Z

setup.sh

+    LB_SHORT_SHA=$(echo "${TARBALL_FILENAME}" | sed -E 's/.*-g([0-9a-f]+)\.tar\.gz/\1/')
+    if [ -n "${LB_SHORT_SHA}" ]; then
+        printf '%s\n' "${LB_SHORT_SHA}" >/var/www/html/config/version-suffix.txt
+    else
+        echo "ERROR determining the LB_SHORT_SHA value from TARBALL_FILENAME ${TARBALL_FILENAME}" >&2
+        exit 1


LB_SHORT_SHA extraction uses sed -E 's/.*-g([0-9a-f]+)\.tar\.gz/\1/' without -n/p, so if the filename format ever differs (no match), sed returns the entire original filename. Since the code only checks -n, it would then write a non-SHA string to version-suffix.txt. Make the extraction fail closed (only output on match) and treat non-matches as an error.

Copilot · 2026-03-08T16:50:06Z

setup.sh

+cat >/etc/apache2/conf-available/remoteip.conf <<EOF
+RemoteIPHeader X-Real-IP
+RemoteIPInternalProxy 10.0.0.0/8
+RemoteIPInternalProxy 172.16.0.0/12
+RemoteIPInternalProxy 192.168.0.0/16
+EOF
+a2enconf remoteip
+a2enmod rewrite
+a2enmod headers
+a2enmod remoteip


The remoteip.conf configuration trusts entire private IP ranges via RemoteIPInternalProxy (10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16), so any client on those networks is treated as a trusted proxy and can control the X-Real-IP header. An attacker on an internal or VPN network could forge X-Real-IP to spoof their client IP, potentially bypassing IP-based access controls or skewing logs and security analytics that rely on REMOTE_ADDR. Restrict RemoteIPInternalProxy to the specific reverse proxy IPs or subnets actually in front of Apache, rather than broad RFC1918 ranges.

ikke-t

I assume apart from linter and while loop and dockerfile all are just white space changes?

I didn't test these, but read thrm through. Nothing apart removing setup.sh from container catches my eye.

Dockerfile

JohnVillalovos · 2026-03-08T19:26:53Z

I have updated the PR and made shfmt use an indentation level of 2, as that is what was there before. So the diff is now simpler.

I assume apart from linter and while loop and dockerfile all are just white space changes?

Yes. That is correct.

Nothing apart removing setup.sh from container catches my eye.

Done

Also run `shfmt -i 4 -ci -w bin/*sh`

Copilot

Pull request overview

Copilot reviewed 3 out of 5 changed files in this pull request and generated 3 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

You can also share your feedback on Copilot code review. Take the survey.

Copilot · 2026-03-09T05:42:20Z

setup.sh

+if ! [ -d /var/www/html/tpl_c ]; then
+  mkdir /var/www/html/tpl_c
+fi
+mkdir /var/www/html/Web/uploads/reservation


mkdir /var/www/html/Web/uploads/reservation will fail the build if that directory already exists (or if the parent path is missing). Make this idempotent (e.g., use -p) so newer LibreBooking releases that already include the directory won’t break the image build.

Suggested change

mkdir /var/www/html/Web/uploads/reservation

mkdir -p /var/www/html/Web/uploads/reservation

I agree with Copilot

.github/workflows/build_pull_request.yml

colisee · 2026-03-09T07:52:02Z

Dockerfile

+export APP_GH_ADD_SHA="${APP_GH_ADD_SHA}"
+chmod +x /usr/local/bin/setup.sh
+/usr/local/bin/setup.sh
+rm /usr/local/bin/setup.sh


It is useless to rm /usr/local/bin/setup.sh, for setup.sh is present in the previous image layer (added by the previous COPY statement)

colisee · 2026-03-09T07:53:57Z

setup.sh

+#!/bin/bash
+# vim: set expandtab ts=2 sw=2 ai :
+
+set -e


Any particular reason why you don't combine the various set statements in 1 line?

colisee · 2026-03-09T07:57:02Z

setup.sh

+apt-get upgrade --yes
+apt-get install --yes --no-install-recommends \
+  cron \
+  git \


We could get rid of git, unless we prefer to keep it and use it to retrieve the sources of librebooking/librebooking and determine the last SHA

colisee · 2026-03-09T07:57:43Z

setup.sh

+  -i /etc/apache2/sites-available/000-default.conf \
+  -e 's/<VirtualHost *:80>/<VirtualHost *:8080>/'
+
+set -xeuo pipefail


Why do we repeat set -xeuo pipefail here?

colisee · 2026-03-09T11:18:26Z

Aside from your comments, above, I tested a build with podman and ran a podman kube play and it worked like a charm.

Copilot AI review requested due to automatic review settings March 8, 2026 14:50

JohnVillalovos marked this pull request as draft March 8, 2026 14:50

Copilot started reviewing on behalf of JohnVillalovos March 8, 2026 14:50 View session

JohnVillalovos force-pushed the jlvillal/remove_shell branch from 1f0e1e5 to fb24c4c Compare March 8, 2026 14:52

Copilot AI reviewed Mar 8, 2026

View reviewed changes

Dockerfile Outdated Show resolved Hide resolved

JohnVillalovos force-pushed the jlvillal/remove_shell branch 7 times, most recently from db2577b to b921d1b Compare March 8, 2026 15:29

fix: convert from long RUN statements to a setup.sh script

8eec380

Convert the multiple `RUN` statements into a `setup.sh` bash script. Add a CI job to check the shell scripts.

JohnVillalovos force-pushed the jlvillal/remove_shell branch 2 times, most recently from b8e890a to d350b05 Compare March 8, 2026 15:53

JohnVillalovos requested a review from Copilot March 8, 2026 15:54

Copilot started reviewing on behalf of JohnVillalovos March 8, 2026 15:54 View session

JohnVillalovos changed the title ~~fix: remove use of SHELL and specify bash in RUN~~ fix: convert from long RUN statements to a setup.sh script Mar 8, 2026

JohnVillalovos marked this pull request as ready for review March 8, 2026 15:56

Copilot AI reviewed Mar 8, 2026

View reviewed changes

Dockerfile Outdated Show resolved Hide resolved

Dockerfile Show resolved Hide resolved

JohnVillalovos force-pushed the jlvillal/remove_shell branch from d350b05 to ccbaac8 Compare March 8, 2026 16:45

JohnVillalovos requested review from colisee, Copilot and ikke-t March 8, 2026 16:46

Copilot started reviewing on behalf of JohnVillalovos March 8, 2026 16:46 View session

Copilot AI reviewed Mar 8, 2026

View reviewed changes

ikke-t requested changes Mar 8, 2026

View reviewed changes

Dockerfile Show resolved Hide resolved

JohnVillalovos force-pushed the jlvillal/remove_shell branch 2 times, most recently from 673cd5f to eb82df2 Compare March 8, 2026 19:25

JohnVillalovos force-pushed the jlvillal/remove_shell branch from eb82df2 to 33977eb Compare March 8, 2026 19:38

JohnVillalovos requested a review from ikke-t March 8, 2026 19:49

ikke-t approved these changes Mar 8, 2026

View reviewed changes

chore: resolve shellcheck issues with bin/*.sh

1324de3

Also run `shfmt -i 4 -ci -w bin/*sh`

JohnVillalovos force-pushed the jlvillal/remove_shell branch from 33977eb to 1324de3 Compare March 9, 2026 05:32

JohnVillalovos requested a review from Copilot March 9, 2026 05:37

Copilot started reviewing on behalf of JohnVillalovos March 9, 2026 05:37 View session

Copilot AI reviewed Mar 9, 2026

View reviewed changes

colisee reviewed Mar 9, 2026

View reviewed changes

	mkdir /var/www/html/Web/uploads/reservation
	mkdir -p /var/www/html/Web/uploads/reservation

Conversation

JohnVillalovos commented Mar 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

JohnVillalovos commented Mar 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Mar 8, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 8, 2026

Choose a reason for hiding this comment

Uh oh!

ikke-t left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

JohnVillalovos commented Mar 8, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Mar 9, 2026

Choose a reason for hiding this comment

Uh oh!

colisee Mar 9, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

colisee Mar 9, 2026

Choose a reason for hiding this comment

Uh oh!

colisee Mar 9, 2026

Choose a reason for hiding this comment

Uh oh!

colisee Mar 9, 2026

Choose a reason for hiding this comment

Uh oh!

colisee Mar 9, 2026

Choose a reason for hiding this comment

Uh oh!

colisee commented Mar 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

JohnVillalovos commented Mar 8, 2026 •

edited

Loading

JohnVillalovos commented Mar 8, 2026 •

edited

Loading