Compare commits

...

8 Commits

Author SHA1 Message Date
Markus Opolka
0e35fa6d05 Upgrading to Version 5.2.4+211129 2021-12-07 11:57:55 +01:00
Markus Opolka
0650b759c0 Upgrading to LTS Version 3.27.27+211130 2021-12-07 11:57:04 +01:00
Jérôme Rautureau
7f87925fa7 Limesurvey not compatible with 8.1 docker image (#110)
Limesurvey not compatible with 8.1 docker image yet

* Causes PHP 8.1 deprecation notices and other stuff
* Set all image to PHP 8.0. 

Co-authored-by: Jérôme Rautureau <Jérôme Rautureau jerome.rautureau@agglo-larochelle.fr>
2021-12-03 09:00:40 +01:00
Markus Opolka
71fade66fe Merge pull request #109 from le-zell/patch-1
Update entrypoint.sh
2021-12-02 10:15:01 +01:00
Jérôme Rautureau
1ff7ea366d Update entrypoint.sh
corrections on entrypoint.sh (missing doucle quotes)
2021-12-02 09:32:51 +01:00
Markus Opolka
fadbe68076 Merge pull request #108 from martialblog/traefik-example
Add a Traefik example with subpath
2021-12-02 08:29:04 +01:00
Markus Opolka
c73949610f Add Traefik docker-compose example 2021-12-02 08:20:25 +01:00
Markus Opolka
79aea85bfe Upgrading to Version 5.2.3+211122 2021-11-29 12:29:37 +01:00
13 changed files with 71 additions and 23 deletions

View File

@@ -1,7 +1,7 @@
FROM php:7.4-apache
FROM php:8.0-apache
LABEL maintainer="markus@martialblog.de"
ARG version='3.27.26+211123'
ARG sha256_checksum='fc1176d71efc7fa4c10415ebfff5d0c78c73b1458bc30822443c4c17928a97d1'
ARG version='3.27.27+211130'
ARG sha256_checksum='ac6c85b801dededfa4325ab47f7690800ed82b0aa642ded9a27920015c75c8f6'
ARG USER=root
ARG LISTEN_PORT=80

View File

@@ -1,7 +1,7 @@
FROM php:7.4-fpm-alpine
FROM php:8.0-fpm-alpine
LABEL maintainer="markus@martialblog.de"
ARG version='3.27.26+211123'
ARG sha256_checksum='fc1176d71efc7fa4c10415ebfff5d0c78c73b1458bc30822443c4c17928a97d1'
ARG version='3.27.27+211130'
ARG sha256_checksum='ac6c85b801dededfa4325ab47f7690800ed82b0aa642ded9a27920015c75c8f6'
# Install OS dependencies
RUN set -ex; \

View File

@@ -1,7 +1,7 @@
FROM php:7.4-fpm
FROM php:8.0-fpm
LABEL maintainer="markus@martialblog.de"
ARG version='3.27.26+211123'
ARG sha256_checksum='fc1176d71efc7fa4c10415ebfff5d0c78c73b1458bc30822443c4c17928a97d1'
ARG version='3.27.27+211130'
ARG sha256_checksum='ac6c85b801dededfa4325ab47f7690800ed82b0aa642ded9a27920015c75c8f6'
# Install OS dependencies
RUN set -ex; \

View File

@@ -1,4 +1,4 @@
FROM php:7.4-apache
FROM php:8.0-apache
LABEL maintainer="markus@martialblog.de"
ARG version='4.6.3+210518'
ARG sha256_checksum='3c59afc13d0cf974c465c5f851cb8837117518e94031f5e3a28ba468ad734ce2'

View File

@@ -1,4 +1,4 @@
FROM php:7.4-fpm-alpine
FROM php:8.0-fpm-alpine
LABEL maintainer="markus@martialblog.de"
ARG version='4.6.3+210518'
ARG sha256_checksum='3c59afc13d0cf974c465c5f851cb8837117518e94031f5e3a28ba468ad734ce2'

View File

@@ -1,4 +1,4 @@
FROM php:7.4-fpm
FROM php:8.0-fpm
LABEL maintainer="markus@martialblog.de"
ARG version='4.6.3+210518'
ARG sha256_checksum='3c59afc13d0cf974c465c5f851cb8837117518e94031f5e3a28ba468ad734ce2'

View File

@@ -1,7 +1,7 @@
FROM php:8-apache
FROM php:8.0-apache
LABEL maintainer="markus@martialblog.de"
ARG version='5.2.2+211115'
ARG sha256_checksum='61148c6131ea99a699d95117d1b53f1ba7971c609c93353e7b6221dd13515659'
ARG version='5.2.4+211129'
ARG sha256_checksum='5a60547c7c2d900cfb323f9459bb3b97821b4d01111cfd1d4795160f70ee9f1d'
ARG USER=www-data
ARG LISTEN_PORT=8080

View File

@@ -1,7 +1,7 @@
FROM php:8-fpm-alpine
FROM php:8.0-fpm-alpine
LABEL maintainer="markus@martialblog.de"
ARG version='5.2.2+211115'
ARG sha256_checksum='61148c6131ea99a699d95117d1b53f1ba7971c609c93353e7b6221dd13515659'
ARG version='5.2.4+211129'
ARG sha256_checksum='5a60547c7c2d900cfb323f9459bb3b97821b4d01111cfd1d4795160f70ee9f1d'
ARG USER=www-data
# Install OS dependencies

View File

@@ -1,7 +1,7 @@
FROM php:8-fpm
FROM php:8.0-fpm
LABEL maintainer="markus@martialblog.de"
ARG version='5.2.2+211115'
ARG sha256_checksum='61148c6131ea99a699d95117d1b53f1ba7971c609c93353e7b6221dd13515659'
ARG version='5.2.4+211129'
ARG sha256_checksum='5a60547c7c2d900cfb323f9459bb3b97821b4d01111cfd1d4795160f70ee9f1d'
ARG USER=www-data
# Install OS dependencies

View File

@@ -159,7 +159,7 @@ if [ $PHP_UPDATEDB_EXIT_CODE -eq 0 ]; then
else
echo ''
echo 'Running console.php install'
php application/commands/console.php install "$ADMIN_USER" "$ADMIN_PASSWORD" "$ADMIN_NAME $ADMIN_EMAIL"
php application/commands/console.php install "$ADMIN_USER" "$ADMIN_PASSWORD" "$ADMIN_NAME" "$ADMIN_EMAIL"
fi
exec "$@"

View File

@@ -87,6 +87,8 @@ For further details on the settings see: https://manual.limesurvey.org/Data_encr
## Traefik example
**Hint**: if you want to deploy LimeSurvey on a sub-path (e.g. https://example.com/limesurvey) you have to set the BASE_URL and adjust the Containers Webservers. See the docker-compose Traefik example in the repository.
```
# BASE_URL = /limesurvey
"traefik.http.routers.limesurvey.rule=PathPrefix(`/limesurvey`)",

View File

@@ -0,0 +1,46 @@
version: "3.0"
services:
limesurvey:
build:
context: 5.0/apache/
dockerfile: Dockerfile
labels:
traefik.enable: 'true'
traefik.http.routers.limesurvey-http-router.entrypoints: "http"
traefik.http.routers.limesurvey-http-router.rule: "PathPrefix(`/limesurvey`)"
traefik.http.services.limesurvey-service.loadbalancer.server.port: "8080"
links:
- lime-db
depends_on:
- lime-db
volumes:
# Unfortunately the StripPrefix Function in Traefik won't work;
# Meaning, we will have to set 'Alias /limesurvey "/var/www/html"' in the Apache Config
- "./examples/apache-example.conf:/etc/apache2/sites-available/000-default.conf:ro"
environment:
- "DB_HOST=lime-db"
- "DB_PASSWORD=secret"
- "ADMIN_PASSWORD=foobar"
- "PUBLIC_URL=http://localhost:8888/limesurvey"
- "BASE_URL=http://localhost:8888/limesurvey"
traefik:
image: "traefik:v2.5"
container_name: "traefik"
command:
- "--api.insecure=true"
- "--providers.docker=true"
- "--providers.docker.exposedbydefault=false"
- "--entrypoints.http.address=:8888"
ports:
- "8888:8888"
- "8080:8080"
volumes:
- "/var/run/docker.sock:/var/run/docker.sock:ro"
lime-db:
image: mysql:5.7
environment:
- "MYSQL_USER=limesurvey"
- "MYSQL_DATABASE=limesurvey"
- "MYSQL_PASSWORD=secret"
- "MYSQL_ROOT_PASSWORD=secret"

View File

@@ -1,7 +1,7 @@
<VirtualHost *:8080>
ServerAdmin foo@bar.com
DocumentRoot /var/www/html
Alias /lime "/var/www/html"
Alias /limesurvey "/var/www/html"
<Directory />
Options FollowSymLinks