Compare commits

...

4 Commits

Author SHA1 Message Date
Markus Opolka
f0000f7448 Upgrading to Version 4.3.19+201005 2020-10-13 07:49:59 +02:00
Markus Opolka
6d71e4ecc2 Upgrading to LTS Version 3.23.7+201006 2020-10-13 07:48:55 +02:00
Markus Opolka
2d8e54191d Merge pull request #40 from martialblog/baseurl-param
Add BASE_URL Parameter to work with a Reverse Proxy
2020-10-08 13:03:45 +02:00
Markus Opolka
79047b6ef9 Add BASE_URL Parameter to work with a Reverse Proxy 2020-10-08 12:19:21 +02:00
13 changed files with 48 additions and 12 deletions

View File

@@ -1,7 +1,7 @@
FROM php:7.2-apache FROM php:7.2-apache
LABEL maintainer="markus@martialblog.de" LABEL maintainer="markus@martialblog.de"
ARG version='3.23.6+200929' ARG version='3.23.7+201006'
ARG sha256_checksum='e9887e8defa16f33da9d6580c59ea610cc1db722d4c6cb456e0017429835286e' ARG sha256_checksum='8436f6ed8b2cfad1ecda66aedb8baac2543af98a4d27bcb2606c00b1acfb1996'
# Install OS dependencies # Install OS dependencies
RUN set -ex; \ RUN set -ex; \

View File

@@ -20,6 +20,7 @@ ADMIN_NAME=${ADMIN_NAME:-'admin'}
ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'} ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
ADMIN_PASSWORD=${ADMIN_PASSWORD:-} ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
BASE_URL=${BASE_URL:-}
PUBLIC_URL=${PUBLIC_URL:-} PUBLIC_URL=${PUBLIC_URL:-}
URL_FORMAT=${URL_FORMAT:-'path'} URL_FORMAT=${URL_FORMAT:-'path'}
@@ -90,6 +91,9 @@ return array(
'rules' => array(), 'rules' => array(),
'showScriptName' => true, 'showScriptName' => true,
), ),
'request' => array(
'baseUrl' => '$BASE_URL',
),
), ),
'config'=>array( 'config'=>array(
'publicurl'=>'$PUBLIC_URL', 'publicurl'=>'$PUBLIC_URL',

View File

@@ -1,7 +1,7 @@
FROM php:7.2-fpm-alpine FROM php:7.2-fpm-alpine
LABEL maintainer="markus@martialblog.de" LABEL maintainer="markus@martialblog.de"
ARG version='3.23.6+200929' ARG version='3.23.7+201006'
ARG sha256_checksum='e9887e8defa16f33da9d6580c59ea610cc1db722d4c6cb456e0017429835286e' ARG sha256_checksum='8436f6ed8b2cfad1ecda66aedb8baac2543af98a4d27bcb2606c00b1acfb1996'
# Install OS dependencies # Install OS dependencies
RUN set -ex; \ RUN set -ex; \

View File

@@ -20,6 +20,7 @@ ADMIN_NAME=${ADMIN_NAME:-'admin'}
ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'} ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
ADMIN_PASSWORD=${ADMIN_PASSWORD:-} ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
BASE_URL=${BASE_URL:-}
PUBLIC_URL=${PUBLIC_URL:-} PUBLIC_URL=${PUBLIC_URL:-}
URL_FORMAT=${URL_FORMAT:-'path'} URL_FORMAT=${URL_FORMAT:-'path'}
@@ -90,6 +91,9 @@ return array(
'rules' => array(), 'rules' => array(),
'showScriptName' => true, 'showScriptName' => true,
), ),
'request' => array(
'baseUrl' => '$BASE_URL',
),
), ),
'config'=>array( 'config'=>array(
'publicurl'=>'$PUBLIC_URL', 'publicurl'=>'$PUBLIC_URL',

View File

@@ -1,7 +1,7 @@
FROM php:7.2-fpm FROM php:7.2-fpm
LABEL maintainer="markus@martialblog.de" LABEL maintainer="markus@martialblog.de"
ARG version='3.23.6+200929' ARG version='3.23.7+201006'
ARG sha256_checksum='e9887e8defa16f33da9d6580c59ea610cc1db722d4c6cb456e0017429835286e' ARG sha256_checksum='8436f6ed8b2cfad1ecda66aedb8baac2543af98a4d27bcb2606c00b1acfb1996'
# Install OS dependencies # Install OS dependencies
RUN set -ex; \ RUN set -ex; \

View File

@@ -20,6 +20,7 @@ ADMIN_NAME=${ADMIN_NAME:-'admin'}
ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'} ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
ADMIN_PASSWORD=${ADMIN_PASSWORD:-} ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
BASE_URL=${BASE_URL:-}
PUBLIC_URL=${PUBLIC_URL:-} PUBLIC_URL=${PUBLIC_URL:-}
URL_FORMAT=${URL_FORMAT:-'path'} URL_FORMAT=${URL_FORMAT:-'path'}
@@ -90,6 +91,9 @@ return array(
'rules' => array(), 'rules' => array(),
'showScriptName' => true, 'showScriptName' => true,
), ),
'request' => array(
'baseUrl' => '$BASE_URL',
),
), ),
'config'=>array( 'config'=>array(
'publicurl'=>'$PUBLIC_URL', 'publicurl'=>'$PUBLIC_URL',

View File

@@ -1,7 +1,7 @@
FROM php:7.2-apache FROM php:7.2-apache
LABEL maintainer="markus@martialblog.de" LABEL maintainer="markus@martialblog.de"
ARG version='4.3.18+200928' ARG version='4.3.19+201005'
ARG sha256_checksum='65743dc9fd3577ab88f2270013fc97887699ffba2ef133db533beb6995018314' ARG sha256_checksum='ef9f8c14e818da33de395c1c80572f943e843c9120efc447b4a24a67d62d5682'
# Install OS dependencies # Install OS dependencies
RUN set -ex; \ RUN set -ex; \

View File

@@ -20,6 +20,7 @@ ADMIN_NAME=${ADMIN_NAME:-'admin'}
ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'} ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
ADMIN_PASSWORD=${ADMIN_PASSWORD:-} ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
BASE_URL=${BASE_URL:-}
PUBLIC_URL=${PUBLIC_URL:-} PUBLIC_URL=${PUBLIC_URL:-}
URL_FORMAT=${URL_FORMAT:-'path'} URL_FORMAT=${URL_FORMAT:-'path'}
@@ -90,6 +91,9 @@ return array(
'rules' => array(), 'rules' => array(),
'showScriptName' => true, 'showScriptName' => true,
), ),
'request' => array(
'baseUrl' => '$BASE_URL',
),
), ),
'config'=>array( 'config'=>array(
'publicurl'=>'$PUBLIC_URL', 'publicurl'=>'$PUBLIC_URL',

View File

@@ -1,7 +1,7 @@
FROM php:7.2-fpm-alpine FROM php:7.2-fpm-alpine
LABEL maintainer="markus@martialblog.de" LABEL maintainer="markus@martialblog.de"
ARG version='4.3.18+200928' ARG version='4.3.19+201005'
ARG sha256_checksum='65743dc9fd3577ab88f2270013fc97887699ffba2ef133db533beb6995018314' ARG sha256_checksum='ef9f8c14e818da33de395c1c80572f943e843c9120efc447b4a24a67d62d5682'
# Install OS dependencies # Install OS dependencies
RUN set -ex; \ RUN set -ex; \

View File

@@ -20,6 +20,7 @@ ADMIN_NAME=${ADMIN_NAME:-'admin'}
ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'} ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
ADMIN_PASSWORD=${ADMIN_PASSWORD:-} ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
BASE_URL=${BASE_URL:-}
PUBLIC_URL=${PUBLIC_URL:-} PUBLIC_URL=${PUBLIC_URL:-}
URL_FORMAT=${URL_FORMAT:-'path'} URL_FORMAT=${URL_FORMAT:-'path'}
@@ -90,6 +91,9 @@ return array(
'rules' => array(), 'rules' => array(),
'showScriptName' => true, 'showScriptName' => true,
), ),
'request' => array(
'baseUrl' => '$BASE_URL',
),
), ),
'config'=>array( 'config'=>array(
'publicurl'=>'$PUBLIC_URL', 'publicurl'=>'$PUBLIC_URL',

View File

@@ -1,7 +1,7 @@
FROM php:7.2-fpm FROM php:7.2-fpm
LABEL maintainer="markus@martialblog.de" LABEL maintainer="markus@martialblog.de"
ARG version='4.3.18+200928' ARG version='4.3.19+201005'
ARG sha256_checksum='65743dc9fd3577ab88f2270013fc97887699ffba2ef133db533beb6995018314' ARG sha256_checksum='ef9f8c14e818da33de395c1c80572f943e843c9120efc447b4a24a67d62d5682'
# Install OS dependencies # Install OS dependencies
RUN set -ex; \ RUN set -ex; \

View File

@@ -20,6 +20,7 @@ ADMIN_NAME=${ADMIN_NAME:-'admin'}
ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'} ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
ADMIN_PASSWORD=${ADMIN_PASSWORD:-} ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
BASE_URL=${BASE_URL:-}
PUBLIC_URL=${PUBLIC_URL:-} PUBLIC_URL=${PUBLIC_URL:-}
URL_FORMAT=${URL_FORMAT:-'path'} URL_FORMAT=${URL_FORMAT:-'path'}
@@ -90,6 +91,9 @@ return array(
'rules' => array(), 'rules' => array(),
'showScriptName' => true, 'showScriptName' => true,
), ),
'request' => array(
'baseUrl' => '$BASE_URL',
),
), ),
'config'=>array( 'config'=>array(
'publicurl'=>'$PUBLIC_URL', 'publicurl'=>'$PUBLIC_URL',

View File

@@ -52,6 +52,17 @@ To change to LimeSurvey configuration, you can mount a Volume into the Container
**Hint**: If this configuration is present before the installation, the LimeSurvey Web Installer will not run automatically. **Hint**: If this configuration is present before the installation, the LimeSurvey Web Installer will not run automatically.
# Reverse Proxy Configuration
## Traefik Example
```
# BASE_URL = /limesurvey
"traefik.http.routers.limesurvey.rule=PathPrefix(`/limesurvey`)",
"traefik.http.routers.limesurvey.middlewares=strip-limesurvey@docker",
"traefik.http.middlewares.strip-limesurvey.stripprefix.prefixes=/limesurvey",
```
## Data Encryption ## Data Encryption
LimeSurvey 4 supports data encryption, this image give you these options: LimeSurvey 4 supports data encryption, this image give you these options:
@@ -79,6 +90,7 @@ For further details on the settings see: https://manual.limesurvey.org/Data_encr
| ADMIN_EMAIL | Initial LimeSurvey Admin Email | | ADMIN_EMAIL | Initial LimeSurvey Admin Email |
| ADMIN_PASSWORD | Initial LimeSurvey Admin Password | | ADMIN_PASSWORD | Initial LimeSurvey Admin Password |
| PUBLIC_URL | Public URL for public scripts | | PUBLIC_URL | Public URL for public scripts |
| BASE_URL | Application Base URL |
| URL_FORMAT | URL Format. path or get | | URL_FORMAT | URL Format. path or get |
| DEBUG | Debug level (0, 1, 2). Default: 0 | | DEBUG | Debug level (0, 1, 2). Default: 0 |
| DEBUG_SQL | SQL Debug level (0, 1, 2). Default 0 | | DEBUG_SQL | SQL Debug level (0, 1, 2). Default 0 |