Enable rootless container execution (podman) (#140)

* Switch to ports 8080 / 8443 to make the image rootless-compatible

* Switch to ports 8080 / 8443 in script .examples/insecure/start.sh

---------

Co-authored-by: Robin Alexander <colisee@hotmail>

Author: colisee

.examples/insecure/docker-compose.yml

@@ -14,7 +14,7 @@ services:
     depends_on:
       - db
     ports:
-      - "80:80"
+      - "8080:8080"
     volumes:
       - app_conf:/config
     env_file:
@@ -33,4 +33,4 @@ services:
 
 volumes:
   db_conf:
-  app_conf:
+  app_conf:

.examples/insecure/start.sh

@@ -22,7 +22,7 @@ docker run \
   --detach \
   --name librebooking-app \
   --network mynet \
-  --publish 80:80 \
+  --publish 8080:8080 \
   --volume librebooking-conf:/config \
   --env LB_DATABASE_NAME=librebooking \
   --env LB_DATABASE_USER=lb_user \
@@ -51,4 +51,4 @@ docker run \
   --env LB_LOGGING_LEVEL=DEBUG \
   --env LB_LOGGING_SQL=false \
   --env LB_DEFAULT_TIMEZONE=Europe/Zurich \
- librebooking/librebooking:develop
+ librebooking/librebooking:develop

.examples/secure/docker-compose.yml

@@ -59,6 +59,7 @@ services:
       - LB_UPLOADS_IMAGE_UPLOAD_URL=Web/uploads/images
       - LB_UPLOADS_RESERVATION_ATTACHMENT_PATH=Web/uploads/reservation
       - VIRTUAL_HOST=acme.org
+      - VIRTUAL_PORT=8080
       - VIRTUAL_PATH=/book
       - LETSENCRYPT_HOST=acme.org
     secrets:
@@ -104,6 +105,7 @@ services:
       - LB_LOGGING_SQL=false
       - LB_DEFAULT_TIMEZONE=Europe/Zurich
       - VIRTUAL_HOST=acme.org
+      - VIRTUAL_PORT=8080
       - LETSENCRYPT_HOST=acme.org
     secrets:
       - lb_install_pwd
@@ -148,4 +150,4 @@ secrets:
     file: ./pwd_lb_inst.txt
 
 networks:
-  mynet:
+  mynet:

Dockerfile

@@ -58,7 +58,14 @@ RUN set -ex; \
     mkdir --parent /var/log/librebooking; \
     chown www-data:www-data /var/log/librebooking; \
     touch /usr/local/etc/php/conf.d/librebooking.ini; \
-    chown www-data:www-data /usr/local/etc/php/conf.d/librebooking.ini
+    chown www-data:www-data /usr/local/etc/php/conf.d/librebooking.ini; \
+    sed \
+      -i /etc/apache2/ports.conf \
+      -e 's/Listen 80/Listen 8080/' \
+      -e 's/Listen 443/Lisen 8443/'; \
+    sed \
+      -i /etc/apache2/sites-available/000-default.conf \
+      -e 's/<VirtualHost *:80>/<VirtualHost *:8080>/';
 
 # Get and customize librebooking
 USER www-data
@@ -89,3 +96,4 @@ WORKDIR    /
 VOLUME     /config
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
 CMD        ["apache2-foreground"]
+EXPOSE     8080