Compare commits

...

34 Commits

Author SHA1 Message Date
Markus Opolka
392e28405a Upgrading to Version 5.3.4+220309 2022-03-14 17:49:24 +01:00
Markus Opolka
a6c71d5d10 Upgrading to LTS Version 3.28.2+220308 2022-03-14 17:48:44 +01:00
Markus Opolka
d6093e43d2 Upgrading to Version 5.3.3+220307 2022-03-09 19:28:46 +01:00
Markus Opolka
2aa9153abc Upgrading to LTS Version 3.28.1+220229 2022-03-08 07:47:47 +01:00
Markus Opolka
027a8a4589 Upgrading to Version 5.3.1+220301 2022-03-03 07:56:43 +01:00
Markus Opolka
6dd4088f7d Upgrading to Version 5.3.1+220228 2022-03-02 08:11:19 +01:00
Markus Opolka
2c2106522b Upgrading to Version 5.3.0+220228 2022-03-01 12:51:28 +01:00
Markus Opolka
b6ad489977 Upgrading to LTS Version 3.28.1+220215 2022-03-01 12:50:46 +01:00
Markus Opolka
cb2286e6be Upgrading to Version 5.2.13+220207 2022-02-17 07:56:44 +01:00
Markus Opolka
241f855f0e Upgrading to LTS Version 3.27.35+220208 2022-02-17 07:55:57 +01:00
Markus Opolka
7ba3ad6618 Upgrading to Version 5.2.12+220131 2022-02-08 07:59:42 +01:00
Markus Opolka
e486bf1ec6 Upgrading to LTS Version 3.27.34+220132 2022-02-08 07:58:40 +01:00
Markus Opolka
dfb5b39211 Upgrading to Version 5.2.11+220124 2022-02-01 08:11:21 +01:00
Markus Opolka
16175a30ac Upgrading to LTS Version 3.27.33+220125 2022-02-01 08:09:52 +01:00
Markus Opolka
69178ec686 Upgrading to Version 5.2.10+220118 2022-01-24 14:06:58 +01:00
Markus Opolka
822a936b36 Upgrading to LTS Version 3.27.32+220119 2022-01-24 14:06:16 +01:00
Markus Opolka
99f898aedc Upgrading to Version 5.2.9+220110 2022-01-18 16:52:59 +01:00
Markus Opolka
b3bfb6f2a3 Upgrading to LTS Version 3.27.31+220104 2022-01-18 16:49:41 +01:00
Markus Opolka
f2c65ebc44 Enable :latest Tag for Apache Image (#115) 2022-01-18 14:54:17 +01:00
Jack Henschel
80a9ca9173 Merge pull request #113 from martialblog/jacksgt-patch-1
Correct path to data volume of Postgres deployment
2022-01-11 11:35:45 +01:00
Jack Henschel
cb13a177b6 Correct path to data volume of Postgres deployment
Fixes https://github.com/martialblog/docker-limesurvey/issues/112
2022-01-10 08:31:20 +01:00
Markus Opolka
70a86c2301 Upgrading to Version 5.2.7+211221 2022-01-05 10:00:39 +01:00
Markus Opolka
bcd42d3f63 Upgrading to LTS Version 3.27.30+211222 2022-01-05 09:59:14 +01:00
Markus Opolka
0dbe244a9c Upgrading to Version 5.2.6+211213 2021-12-22 09:18:51 +01:00
Markus Opolka
41520cf155 Upgrading to LTS Version 3.27.29+211214 2021-12-22 09:17:55 +01:00
Markus Opolka
4554f13f3d Upgrading to Version 5.2.5+211207 2021-12-14 13:53:27 +01:00
Markus Opolka
edea222851 Upgrading to LTS Version 3.27.28+211208 2021-12-14 13:52:25 +01:00
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
15 changed files with 73 additions and 25 deletions

View File

@@ -52,7 +52,7 @@ jobs:
type=match,pattern=(.+),group=1
type=match,pattern=^(\d+),group=1
flavor: |
latest=false
latest=true
suffix=-apache
- name: 'Build and push latest Apache container images'
uses: docker/build-push-action@v2

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.28.2+220308'
ARG sha256_checksum='696519a165ee82464a1d3ccb2196cf8a430ac514f6bf4269e209fa6f116bc576'
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.28.2+220308'
ARG sha256_checksum='696519a165ee82464a1d3ccb2196cf8a430ac514f6bf4269e209fa6f116bc576'
# 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.28.2+220308'
ARG sha256_checksum='696519a165ee82464a1d3ccb2196cf8a430ac514f6bf4269e209fa6f116bc576'
# 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.3+211122'
ARG sha256_checksum='5a5bf3bbc1cc3ddff943e377dfdcb5469a5e5f4532fdc6b43261e7494d82f406'
ARG version='5.3.4+220309'
ARG sha256_checksum='90ee8a68258392e5ff7f5c620581e77320725599f9ec3b4b49e836177daba246'
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.3+211122'
ARG sha256_checksum='5a5bf3bbc1cc3ddff943e377dfdcb5469a5e5f4532fdc6b43261e7494d82f406'
ARG version='5.3.4+220309'
ARG sha256_checksum='90ee8a68258392e5ff7f5c620581e77320725599f9ec3b4b49e836177daba246'
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.3+211122'
ARG sha256_checksum='5a5bf3bbc1cc3ddff943e377dfdcb5469a5e5f4532fdc6b43261e7494d82f406'
ARG version='5.3.4+220309'
ARG sha256_checksum='90ee8a68258392e5ff7f5c620581e77320725599f9ec3b4b49e836177daba246'
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

@@ -24,7 +24,7 @@ services:
lime-db:
image: postgres:10
volumes:
- db-data:/var/lib/postgresql
- db-data:/var/lib/postgresql/data
environment:
- "POSTGRES_USER=limesurvey"
- "POSTGRES_DB=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