allow overriding the lizmap_version at build time

.github/workflows/release.yaml

@@ -0,0 +1,35 @@
+name: 🧪 Release
+
+on:
+  release:
+    types: ['published']
+
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        uses: actions/checkout@v2
+      -
+        name: Extract tag
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          tags: opengisch/lizmap:${{ env.RELEASE_VERSION }}

Dockerfile

@@ -1,23 +1,124 @@
+FROM ubuntu:22.04
+LABEL opengisch.image.authors=="Clemens Rudert"
 
-FROM debian:jessie
-MAINTAINER Julien Ancelin / docker-lizmap 
+ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get -y update \
-    && apt-get -t jessie install -y  python-simplejson python-software-properties xauth htop vim curl ntp ntpdate ssl-cert\ 
-    apache2 apache2-mpm-worker apache2-mpm-prefork apache2-bin apache2-data libapache2-mod-fcgid libapache2-mod-php5 \
-    php5 php5-common php5-cgi php5-curl php5-cli php5-sqlite php5-gd php5-pgsql unzip\
-    && apt-get clean \
+    && apt-get install -y software-properties-common \
+    && add-apt-repository -y universe
+    # && add-apt-repository ppa:ondrej/php
+
+RUN apt-get -y update \
+    && apt-get install -y --fix-missing \
+    python3-simplejson \
+    xauth \
+    htop \
+    nano \
+    curl \
+    ntp \
+    ntpdate \
+    ssl-cert \
+    openssl \
+    software-properties-common \
+    apache2 libapache2-mod-fcgid \
+    php-fpm \
+    php \
+    php-curl \
+    php-cli \
+    php-pdo \
+    php-pgsql \
+    php-sqlite3 \
+    php-gd \
+    php-xmlrpc \
+    php-xml \
+    php-ldap\
+    php-date \
+    # php-zlib \
+    sqlite3 \
+    postgresql-client \
+    cron certbot python3-certbot-apache \
+    unzip \
+    rsync \
+    zlib1g
+
+RUN apt-get clean \
     && rm -r /var/lib/apt/lists/*
-
-RUN a2dismod php5; a2enmod actions; a2enmod fcgid ; a2enmod ssl; a2enmod rewrite; a2enmod headers; \
-    a2enmod deflate; a2enmod php5
 
-ENV LIZMAPVERSION master
-COPY files/ /home/files/
+# Get php composer
+RUN curl -sS https://getcomposer.org/installer -o /tmp/composer-setup.php && \
+    HASH=`curl -sS https://composer.github.io/installer.sig` && \
+    echo $HASH && \
+    php -r "if (hash_file('SHA384', '/tmp/composer-setup.php') === '$HASH') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" && \
+    php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer
+
+ARG LE_domain="example.com"
+ARG LE_email="info@example.com"
+ARG LE_staging='true'
+ARG LE_on='false'
+
+ENV LE_domain=$LE_domain
+ENV LE_email=$LE_email
+ENV LE_staging=$LE_staging
+ENV LE_on=$LE_on
+
+# this can be overriden at build time with --build-arg lizmap_version=release_3_2
+ARG lizmap_version=3.6.7
+ENV LIZMAPVERSION=$lizmap_version
+
+# setup apache modules
+RUN a2dismod mpm_prefork mpm_event; \
+    a2enmod actions alias ssl rewrite headers deflate mpm_worker; \
+    a2enmod fcgid proxy_fcgi;
+
+# copy config
+COPY conf/apache2.conf /etc/apache2/
+COPY conf/mod_deflate.conf /etc/apache2/conf-available/
+COPY conf/fcgid.conf /etc/apache2/mods-enabled/
+COPY conf/default-ssl.conf /etc/apache2/sites-available/
+COPY conf/000-default.conf /etc/apache2/sites-available/
 
-ADD https://github.com/3liz/lizmap-web-client/archive/$LIZMAPVERSION.zip /var/www/
-RUN /home/files/setup.sh
-
-VOLUME  ["/var/www/websig/lizmap/var" , "/home"] 
+# enable self signed SSL
+RUN mkdir /etc/apache2/ssl
+RUN make-ssl-cert /usr/share/ssl-cert/ssleay.cnf /etc/apache2/ssl/apache.pem
+RUN a2ensite default-ssl
+
+# install lizmap
+RUN echo "Downloading https://github.com/3liz/lizmap-web-client/releases/download/$LIZMAPVERSION/lizmap-web-client-$LIZMAPVERSION.zip"
+RUN mkdir -p /var/www/ \
+    && curl -SL https://github.com/3liz/lizmap-web-client/releases/download/$LIZMAPVERSION/lizmap-web-client-$LIZMAPVERSION.zip > lizmap-web-client-$LIZMAPVERSION.zip && \
+    unzip -q lizmap-web-client-$LIZMAPVERSION.zip && \
+    rsync -a lizmap-web-client-$LIZMAPVERSION/* /var/www && \
+    rm -rf lizmap-web-client-$LIZMAPVERSION && \
+    rm -rf lizmap-web-client-$LIZMAPVERSION.zip
+# set default configuration
+RUN cp /var/www/lizmap/var/config/profiles.ini.php.dist /var/www/lizmap/var/config/profiles.ini.php
+COPY conf/lizmapConfig.ini.php /var/www/lizmap/var/config/
+COPY conf/localconfig.ini.php /var/www/lizmap/var/config/
+
+# backup default var folder, it will be copied by docker-entrypoints.sh into /var/www/lizmap/var at first start,
+# if the directory is empty
+RUN mv /var/www/lizmap/var var/www/lizmap/var_install
+
+# use default composer.json and install the extra modules
+RUN cp /var/www/lizmap/my-packages/composer.json.dist /var/www/lizmap/my-packages/composer.json
+ENV COMPOSER_ALLOW_SUPERUSER=1
+RUN composer require --working-dir=/var/www/lizmap/my-packages "jelix/saml-module"
+
+RUN mkdir -p /io/data/
+
+VOLUME  ["/var/www/lizmap/var" , "/io"]
 EXPOSE 80 443
-CMD /start.sh
+
+# Add crontab file in the cron directory
+ADD conf/crontab /etc/cron.d/cache-cron
+# Give execution rights on the cron job
+RUN chmod 0644 /etc/cron.d/cache-cron
+# Apply cron job
+RUN crontab /etc/cron.d/cache-cron
+# Create the log file to be able to run tail
+RUN touch /var/log/cron.log
+
+
+COPY conf/docker-entrypoint.sh /usr/local/bin/
+#RUN chmod u+x /bin/docker-entrypoint.sh
+CMD ["docker-entrypoint.sh"]

README.md

@@ -3,20 +3,21 @@
 docker-lizmap 
 =============
 
-![docker_lizmap](https://cloud.githubusercontent.com/assets/6421175/25778701/68e9a536-3306-11e7-9196-84247b04eb92.png)
-__________________________________________________________________
-
-LizMap est une solution complète de publication de cartes QGIS sur Internet.
-
 LizMap is a complete Internet QGIS map publishing.
+___________________________________________________________________________
 
-____________________________________________________________________
+Building image:
+---------------
+docker build --build-arg lizmap_version=3.6.7 -t=opengisch/lizmap:3.6.7 .
+
+Using image:
+---------------
 
 With Docker-compose:
 
 * Create a docker-compose.yml and changing the directory path if necessary (home/lizmap/lizmap_project):
 
-https://github.com/jancelin/docker-lizmap/blob/master/docker-compose.yml
+https://github.com/opengisch/docker-lizmap/blob/master/docker-compose.yml
 
 * UP
 
@@ -27,18 +28,52 @@ docker-compose up -d
 * Now config lizmap on web :
 
 ```
-http://ip/websig/lizmap/www/admin.php/config
+http://localhost/admin.php/config
 ```
 * change URL WMS: 
 
 >> http://qgiserver/cgi-bin/qgis_mapserv.fcgi
 
-* Add **/home/** for looking your geo projects
+* Add **/io/qgis/** for looking your geo projects
 
 ![config](https://cloud.githubusercontent.com/assets/6421175/11306233/e945f342-8fb0-11e5-9906-4010b9398ef1.png)
 
 * http://docs.3liz.com/fr/ 
 
+Upgrading from Lizmap 3.5
+-------------------------
+
+If you want to reuse a database containing tables of Lizmap 3.5, create a directory somewhere,
+for example `./lizmap-previous-config`, and copy these files into it:
+
+- at least the `installer.ini.php` of the Lizmap 3.5 installation (stored originally into `lizmap/var/config`)
+- the `lizmapConfig.ini.php` file if you want to retrieve the list of projects
+- the `profiles.ini.php` file if there are specific connection profiles
+- the `localconfig.ini.php` and `liveconfig.ini.php` if you want to retrieve some specific configuration, but
+  you should remove from them any reference to modules that are not used anymore into your new lizmap container. 
+- if you are using a sqlite database, the `jauth.db` database file (stored originally into `lizmap/var/db`)
+
+Modify the `docker-compose.yml` file to mount the `./lizmap-previous-config` directory at `/var/www/lizmap/previous-config`
+for the lizmap image. For example:
+
+```
+services:
+  lizmap:
+    ...
+    volumes:
+     - ./projects:/io/data:ro
+     - var:/var/www/lizmap/var
+     - ./lizmap-previous-config/:/var/www/lizmap/previous-config
+```
+
+Launch docker compose. It will install the `installer.ini.php` and the `jauth.db`, and other configuration files if
+there are present, and then it will launch the Lizmap installer which will migrate data if needed.
+
+Stop the containers and remove the mount on `/var/www/lizmap/previous-config`, else it will overwrite new data
+at the next start, with the old database and old configuration files.
+
+
+
 -------------------------------
 
 Lizmap Web Application generates dynamically a web map application (php/html/css/js) with the help of Qgis Server ( QGIS Server Tutorial ). You can configure one web map per Qgis project with the QGIS LizMap Plugin.

files/apache.conf → conf/000-default.conf

@@ -9,7 +9,7 @@
 	#ServerName www.example.com
 
 	ServerAdmin webmaster@localhost
-	DocumentRoot /var/www
+	DocumentRoot /var/www/lizmap/www
 
 	# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
 	# error, crit, alert, emerg.
@@ -27,13 +27,17 @@
 	# after it has been globally disabled with "a2disconf".
 	#Include conf-available/serve-cgi-bin.conf
 
-ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
-<Directory "/usr/lib/cgi-bin/">
-Options ExecCGI FollowSymLinks
-Require all granted
-AddHandler fcgid-script .fcgi
-</Directory>
+    ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
+    <Directory "/usr/lib/cgi-bin/">
+        Options ExecCGI FollowSymLinks
+        Require all granted
+        AddHandler fcgid-script .fcgi
+    </Directory>
 
+    <FilesMatch \.php$>
+            # 2.4.10+ can proxy to unix socket
+            SetHandler "proxy:unix:/var/run/php/php8.1-fpm.sock|fcgi://localhost/"
+    </FilesMatch>
 </VirtualHost>
 
 # vim: syntax=apache ts=4 sw=4 sts=4 sr noet

conf/crontab

@@ -0,0 +1 @@
+0 */12 * * * certbot renew >/dev/null 2>&1

conf/docker-entrypoint.sh

@@ -0,0 +1,83 @@
+#!/bin/bash
+set -e
+#generate config file
+VARCONFIG="/var/www/lizmap/var/config"
+PREVIOUSCONFIG="/var/www/lizmap/previous-config"
+
+echo "LE_on:" $LE_on
+echo "LE_staging:" $LE_staging
+echo "LE_email:" $LE_email
+echo "LE_domain:" $LE_domain
+
+if [[ ! -d $VARCONFIG ]]; then
+  # the var volume is empty, let's fill it with default configuration files and missing directories
+  echo "Creating Config file in /var"
+  cp -avr /var/www/lizmap/var_install/*  /var/www/lizmap/var
+fi
+
+if [[ -d $PREVIOUSCONFIG ]]; then
+  # there is a volume containing the installer.ini.php file and the jauth.db file of
+  # a previous version of Lizmap, let's install it.
+  if [[ -f $PREVIOUSCONFIG/installer.ini.php ]]; then
+    cp $PREVIOUSCONFIG/installer.ini.php $VARCONFIG/
+  fi
+  if [[ -f $PREVIOUSCONFIG/localconfig.ini.php ]]; then
+    cp $PREVIOUSCONFIG/localconfig.ini.php $VARCONFIG/
+  fi
+  if [[ -f $PREVIOUSCONFIG/liveconfig.ini.php ]]; then
+    cp $PREVIOUSCONFIG/liveconfig.ini.php $VARCONFIG/
+  fi
+  if [[ -f $PREVIOUSCONFIG/profiles.ini.php ]]; then
+    cp $PREVIOUSCONFIG/profiles.ini.php $VARCONFIG/
+  fi
+  if [[ -f $PREVIOUSCONFIG/lizmapConfig.ini.php ]]; then
+    cp $PREVIOUSCONFIG/lizmapConfig.ini.php $VARCONFIG/
+  fi
+  if [[ -f $PREVIOUSCONFIG/jauth.db ]]; then
+    cp $PREVIOUSCONFIG/jauth.db /var/www/lizmap/var/db/
+  fi
+fi
+
+# Apache gets grumpy about PID files pre-existing
+rm -f /run/apache2/apache2.pid
+
+service php8.1-fpm start
+
+if [[ $LE_on == 'true' ]]; then
+
+	if [[ $LE_staging == 'true' ]]; then
+       	echo "LE will use staging certificate"
+    		STAGING='--test-cert'
+	fi
+	LE_CONF=/etc/apache2/sites-enabled/000-default-le-ssl.conf
+	if [[ ! -f "$LE_CONF" ]]; then
+    		/usr/sbin/apachectl start        
+        echo "LE need to create conf files. Issuing:"
+        set -x
+        certbot --non-interactive --apache --redirect --agree-tos --domains $LE_domain --email $LE_email $STAGING
+        set +x
+   		/usr/sbin/apachectl stop
+		sleep 5
+	fi
+fi
+
+# launch the configurator. In case this is an upgrade of Lizmap, it will
+# launch the migration of configuration file if needed
+php /var/www/lizmap/install/configurator.php
+
+# activate extra modules
+php /var/www/lizmap/install/configurator.php saml
+php /var/www/lizmap/install/configurator.php samladmin
+
+# launch the installer, it will launch modules/lizmap installers if
+# lizmap/var was empty or it will launch module updaters if needed..
+php /var/www/lizmap/install/installer.php
+
+# remove cache and temporary files, to be sure that they will be regenerated
+# with the updated configuration and source files
+/var/www/lizmap/install/clean_vartmp.sh
+#set-rights
+/var/www/lizmap/install/set_rights.sh www-data www-data
+
+cron
+exec /usr/sbin/apachectl -DFOREGROUND

files/fcgid.conf → conf/fcgid.conf

@@ -1,8 +1,9 @@
 
 # this file will overwrite default file: /etc/apache2/mods-available/fcgid.conf
-
 <IfModule mod_fcgid.c>
-  AddHandler    fcgid-script .fcgi
+  <IfModule mod_mime.c>
+    AddHandler fcgid-script .fcgi
+  </IfModule>
   FcgidConnectTimeout 300
   FcgidIOTimeout 300
   FcgidMaxProcessesPerClass 50
@@ -12,5 +13,4 @@
   BusyTimeout   300
   FcgidInitialEnv QGIS_AUTH_DB_DIR_PATH /tmp/auth/db/
   FcgidInitialEnv QGIS_AUTH_PASSWORD_FILE /tmp/auth/master/qgis_auth_master_password.txt
-
 </IfModule>