mirror of
https://github.com/mykitserver/docker-limesurvey.git
synced 2025-12-06 16:39:11 +01:00
Compare commits
72 Commits
5.3.23-220
...
3.28.49-23
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
32bd800846 | ||
|
|
6709d9964f | ||
|
|
24c3f9fcd2 | ||
|
|
f80cd5ce70 | ||
|
|
dae147ad6f | ||
|
|
ae6de116f2 | ||
|
|
8b2b966ab2 | ||
|
|
b2425303f6 | ||
|
|
ccb8047f80 | ||
|
|
66b6a31821 | ||
|
|
bd81c0b44a | ||
|
|
59986c3205 | ||
|
|
269774947b | ||
|
|
64f001f58c | ||
|
|
142839f135 | ||
|
|
74f928b609 | ||
|
|
4877b85128 | ||
|
|
908a2817fb | ||
|
|
618b89cadb | ||
|
|
da706033f6 | ||
|
|
ee98ccea0c | ||
|
|
e3dcead592 | ||
|
|
3c7de94fdd | ||
|
|
43a2c383ff | ||
|
|
19efe662d1 | ||
|
|
51f45a8513 | ||
|
|
f0b55dacf9 | ||
|
|
d9eb6aff10 | ||
|
|
d979eb5aa4 | ||
|
|
55d9b48441 | ||
|
|
c0167b9a23 | ||
|
|
6cf8fba820 | ||
|
|
e6b006edfd | ||
|
|
32be5d4370 | ||
|
|
e8818f58e2 | ||
|
|
c7e92149ac | ||
|
|
e8d4216266 | ||
|
|
7597951edf | ||
|
|
d4d89859c1 | ||
|
|
eef6c84c91 | ||
|
|
3117108a47 | ||
|
|
ce612a0bb9 | ||
|
|
f094489674 | ||
|
|
12a8ba2660 | ||
|
|
f3e7c1451a | ||
|
|
66b2708e41 | ||
|
|
5ba0746db1 | ||
|
|
38ba19ffec | ||
|
|
8d54793bf6 | ||
|
|
f8122f286c | ||
|
|
93c5bff4d4 | ||
|
|
b76bc10938 | ||
|
|
db81ee1d42 | ||
|
|
dbb996270d | ||
|
|
b1a85992d7 | ||
|
|
c3f547aa3c | ||
|
|
24ed34bc01 | ||
|
|
77ba4fe5e7 | ||
|
|
4077b9d0c8 | ||
|
|
0ce040715c | ||
|
|
d4072def38 | ||
|
|
8cd721ab4b | ||
|
|
76ccb812a4 | ||
|
|
289e07597c | ||
|
|
10b4f482ff | ||
|
|
89829181a7 | ||
|
|
0fa7cc0c28 | ||
|
|
da15d218b4 | ||
|
|
fe85d3caed | ||
|
|
3ae6ad9a4d | ||
|
|
84bef42be8 | ||
|
|
d586d00f65 |
@@ -1,4 +1,4 @@
|
||||
FROM php:8.0-apache
|
||||
FROM docker.io/php:8.0-apache
|
||||
LABEL maintainer="markus@martialblog.de"
|
||||
|
||||
# Install OS dependencies
|
||||
@@ -59,8 +59,8 @@ RUN a2enmod headers rewrite remoteip; \
|
||||
# Use the default production configuration
|
||||
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
|
||||
|
||||
ARG version="3.28.18+220706"
|
||||
ARG sha256_checksum="f0c84aa746ea5b1bb409817dc17bf388aff0f160ea12254056a9ee27b458e3f3"
|
||||
ARG version="3.28.49+230215"
|
||||
ARG sha256_checksum="5a44cb26afef5d391480b9cb3bd2d052395294b300f8212362b20bbee8e6fe2b"
|
||||
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
|
||||
ARG USER=root
|
||||
ARG LISTEN_PORT=80
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM php:8.0-fpm-alpine
|
||||
FROM docker.io/php:8.0-fpm-alpine
|
||||
LABEL maintainer="markus@martialblog.de"
|
||||
|
||||
# Install OS dependencies
|
||||
@@ -33,8 +33,8 @@ RUN set -ex; \
|
||||
tidy \
|
||||
zip
|
||||
|
||||
ARG version="3.28.18+220706"
|
||||
ARG sha256_checksum="f0c84aa746ea5b1bb409817dc17bf388aff0f160ea12254056a9ee27b458e3f3"
|
||||
ARG version="3.28.49+230215"
|
||||
ARG sha256_checksum="5a44cb26afef5d391480b9cb3bd2d052395294b300f8212362b20bbee8e6fe2b"
|
||||
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
|
||||
ENV LIMESURVEY_VERSION=$version
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM php:8.0-fpm
|
||||
FROM docker.io/php:8.0-fpm
|
||||
LABEL maintainer="markus@martialblog.de"
|
||||
|
||||
# Install OS dependencies
|
||||
@@ -46,8 +46,8 @@ RUN set -ex; \
|
||||
tidy \
|
||||
zip
|
||||
|
||||
ARG version="3.28.18+220706"
|
||||
ARG sha256_checksum="f0c84aa746ea5b1bb409817dc17bf388aff0f160ea12254056a9ee27b458e3f3"
|
||||
ARG version="3.28.49+230215"
|
||||
ARG sha256_checksum="5a44cb26afef5d391480b9cb3bd2d052395294b300f8212362b20bbee8e6fe2b"
|
||||
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
|
||||
ENV LIMESURVEY_VERSION=$version
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM php:8.0-apache
|
||||
FROM docker.io/php:8.0-apache
|
||||
LABEL maintainer="markus@martialblog.de"
|
||||
|
||||
# Install OS dependencies
|
||||
@@ -60,8 +60,8 @@ RUN a2enmod headers rewrite remoteip; \
|
||||
# Use the default production configuration
|
||||
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
|
||||
|
||||
ARG version="5.3.23+220705"
|
||||
ARG sha256_checksum="27ff4c47714f1386d55f808b74c30d9d08cc4b1c0755aabc83517cf7e4176dec"
|
||||
ARG version="5.6.4+230206"
|
||||
ARG sha256_checksum="10495b2f872c7a02d075e307dcb5651bab109c44dfe0783614c0d85f4bb6cc17"
|
||||
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
|
||||
ARG USER=www-data
|
||||
ARG LISTEN_PORT=8080
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM php:8.0-fpm-alpine
|
||||
FROM docker.io/php:8.0-fpm-alpine
|
||||
LABEL maintainer="markus@martialblog.de"
|
||||
|
||||
# Install OS dependencies
|
||||
@@ -34,8 +34,8 @@ RUN set -ex; \
|
||||
tidy \
|
||||
zip
|
||||
|
||||
ARG version="5.3.23+220705"
|
||||
ARG sha256_checksum="27ff4c47714f1386d55f808b74c30d9d08cc4b1c0755aabc83517cf7e4176dec"
|
||||
ARG version="5.6.4+230206"
|
||||
ARG sha256_checksum="10495b2f872c7a02d075e307dcb5651bab109c44dfe0783614c0d85f4bb6cc17"
|
||||
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
|
||||
ARG USER=www-data
|
||||
ENV LIMESURVEY_VERSION=$version
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM php:8.0-fpm
|
||||
FROM docker.io/php:8.0-fpm
|
||||
LABEL maintainer="markus@martialblog.de"
|
||||
|
||||
# Install OS dependencies
|
||||
@@ -46,8 +46,8 @@ RUN set -ex; \
|
||||
tidy \
|
||||
zip
|
||||
|
||||
ARG version="5.3.23+220705"
|
||||
ARG sha256_checksum="27ff4c47714f1386d55f808b74c30d9d08cc4b1c0755aabc83517cf7e4176dec"
|
||||
ARG version="5.6.4+230206"
|
||||
ARG sha256_checksum="10495b2f872c7a02d075e307dcb5651bab109c44dfe0783614c0d85f4bb6cc17"
|
||||
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
|
||||
ARG USER=www-data
|
||||
ENV LIMESURVEY_VERSION=$version
|
||||
|
||||
@@ -2,6 +2,15 @@
|
||||
|
||||
Every Pull Request is welcome.
|
||||
|
||||
## Branches
|
||||
Choosing a proper name for a branch helps us identify its purpose and possibly find an associated bug or feature. Generally a branch name should include a topic such as `fix` or `feature` followed by a description. Branches should have only changes relevant to a specific issue.
|
||||
|
||||
```
|
||||
git checkout -b fix/bug-in-connection
|
||||
git checkout -b feature/improved-config-handling
|
||||
git checkout -b doc/fix-typo
|
||||
```
|
||||
|
||||
## Upgrading the Version
|
||||
|
||||
The versions in this repository should correspond to the [GitHub LimeSurvey Releases](https://github.com/LimeSurvey/LimeSurvey/releases)
|
||||
|
||||
14
Makefile
14
Makefile
@@ -1,14 +1,14 @@
|
||||
# .PHONY: apache fpm fpm-alpine
|
||||
RUNTIME?=podman
|
||||
|
||||
apache-lts:
|
||||
docker build --pull -t docker.io/martialblog/limesurvey:3-apache 3.0/apache
|
||||
$(RUNTIME) build --pull -t docker.io/martialblog/limesurvey:3-apache 3.0/apache
|
||||
apache-latest:
|
||||
docker build --pull -t docker.io/martialblog/limesurvey:5-apache 5.0/apache
|
||||
$(RUNTIME) build --pull -t docker.io/martialblog/limesurvey:5-apache 5.0/apache
|
||||
fpm-alpine-lts:
|
||||
docker build --pull -t docker.io/martialblog/limesurvey:3-fpm-alpine 3.0/fpm-alpine
|
||||
$(RUNTIME) build --pull -t docker.io/martialblog/limesurvey:3-fpm-alpine 3.0/fpm-alpine
|
||||
fpm-alpine-latest:
|
||||
docker build --pull -t docker.io/martialblog/limesurvey:5-fpm-alpine 5.0/fpm-alpine
|
||||
$(RUNTIME) build --pull -t docker.io/martialblog/limesurvey:5-fpm-alpine 5.0/fpm-alpine
|
||||
fpm-lts:
|
||||
docker build --pull -t docker.io/martialblog/limesurvey:3-fpm 3.0/fpm
|
||||
$(RUNTIME) build --pull -t docker.io/martialblog/limesurvey:3-fpm 3.0/fpm
|
||||
fpm-latest:
|
||||
docker build --pull -t docker.io/martialblog/limesurvey:5-fpm 5.0/fpm
|
||||
$(RUNTIME) build --pull -t docker.io/martialblog/limesurvey:5-fpm 5.0/fpm
|
||||
|
||||
11
README.md
11
README.md
@@ -117,7 +117,7 @@ For further details on the settings see: https://manual.limesurvey.org/Data_encr
|
||||
| BASE_URL | Application Base URL |
|
||||
| URL_FORMAT | URL Format. path or get |
|
||||
| TABLE_SESSION | Enable table sessions (true) |
|
||||
| SHOW_SCRIPT_NAME | Script name in URL (true|false). Default: true |
|
||||
| SHOW_SCRIPT_NAME | Script name in URL (true\|false). Default: true |
|
||||
| DEBUG | Debug level (0, 1, 2). Default: 0 |
|
||||
| DEBUG_SQL | SQL Debug level (0, 1, 2). Default 0 |
|
||||
| ENCRYPT_KEYPAIR | Data encryption keypair |
|
||||
@@ -185,6 +185,15 @@ drwxr-xr-x 3 82 82 4096 Jun 3 13:51 surveys
|
||||
|
||||
If you are using the Apache2 Images, the default port will now be **8080**. Depending on your setup the port configurations might need adjustment.
|
||||
|
||||
# Known Issues
|
||||
|
||||
## LimeSurvey behind a reverse proxy with a subdirectory
|
||||
|
||||
When running LimeSurvey behind a reverse proxy with a subdirectory (i.e. example.com/limesurvey), the admin area might not be displayed correctly due to a routing issue. The application will forward you to the base url regardless. See:
|
||||
- https://github.com/martialblog/docker-limesurvey/issues/49
|
||||
- https://github.com/martialblog/docker-limesurvey/issues/127
|
||||
- https://github.com/martialblog/docker-limesurvey/issues/106
|
||||
|
||||
# References
|
||||
|
||||
- https://www.limesurvey.org/
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
version: '3'
|
||||
services:
|
||||
limesurvey:
|
||||
image: martialblog/limesurvey:latest
|
||||
image: docker.io/martialblog/limesurvey:latest
|
||||
restart: always
|
||||
environment:
|
||||
- DB_TYPE=pgsql
|
||||
@@ -22,7 +22,7 @@ services:
|
||||
depends_on:
|
||||
- db
|
||||
db:
|
||||
image: postgres:10-alpine
|
||||
image: docker.io/postgres:10-alpine
|
||||
restart: always
|
||||
volumes:
|
||||
- db-data:/var/lib/postgresql
|
||||
|
||||
@@ -33,14 +33,14 @@ services:
|
||||
environment:
|
||||
- "HOSTNAMES=www.example.com example.com"
|
||||
certbot:
|
||||
image: certbot/certbot
|
||||
image: docker.io/certbot/certbot
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- ./certbot/conf:/etc/letsencrypt
|
||||
- ./certbot/www:/var/www/certbot
|
||||
entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'"
|
||||
lime-db:
|
||||
image: mysql:5.7
|
||||
image: docker.io/mysql:5.7
|
||||
environment:
|
||||
- "MYSQL_USER=limesurvey"
|
||||
- "MYSQL_DATABASE=limesurvey"
|
||||
|
||||
@@ -17,7 +17,7 @@ services:
|
||||
- "DB_PASSWORD=secret"
|
||||
- "ADMIN_PASSWORD=foobar"
|
||||
lime-web:
|
||||
image: nginx:alpine
|
||||
image: docker.io/nginx:alpine
|
||||
links:
|
||||
- limesurvey
|
||||
depends_on:
|
||||
@@ -28,7 +28,7 @@ services:
|
||||
- ./examples/nginx.conf:/etc/nginx/nginx.conf:ro
|
||||
- lime:/var/www/html
|
||||
lime-db:
|
||||
image: mysql:5.7
|
||||
image: docker.io/mysql:5.7
|
||||
environment:
|
||||
- "MYSQL_USER=limesurvey"
|
||||
- "MYSQL_DATABASE=limesurvey"
|
||||
|
||||
@@ -17,7 +17,7 @@ services:
|
||||
- "DB_PASSWORD=secret"
|
||||
- "ADMIN_PASSWORD=foobar"
|
||||
lime-web:
|
||||
image: nginx
|
||||
image: docker.io/nginx
|
||||
links:
|
||||
- limesurvey
|
||||
ports:
|
||||
@@ -26,7 +26,7 @@ services:
|
||||
- ./examples/nginx.conf:/etc/nginx/nginx.conf:ro
|
||||
- lime:/var/www/html
|
||||
lime-db:
|
||||
image: mysql:5.7
|
||||
image: docker.io/mysql:5.7
|
||||
environment:
|
||||
- "MYSQL_USER=limesurvey"
|
||||
- "MYSQL_DATABASE=limesurvey"
|
||||
|
||||
@@ -22,7 +22,7 @@ services:
|
||||
- "DB_PASSWORD=secret"
|
||||
- "ADMIN_PASSWORD=foobar"
|
||||
lime-db:
|
||||
image: postgres:10
|
||||
image: docker.io/postgres:10
|
||||
volumes:
|
||||
- db-data:/var/lib/postgresql/data
|
||||
environment:
|
||||
|
||||
@@ -24,7 +24,7 @@ services:
|
||||
- "PUBLIC_URL=http://localhost:8888/limesurvey"
|
||||
- "BASE_URL=http://localhost:8888/limesurvey"
|
||||
traefik:
|
||||
image: "traefik:v2.5"
|
||||
image: docker.io/traefik:v2.5
|
||||
container_name: "traefik"
|
||||
command:
|
||||
- "--api.insecure=true"
|
||||
@@ -37,7 +37,7 @@ services:
|
||||
volumes:
|
||||
- "/var/run/docker.sock:/var/run/docker.sock:ro"
|
||||
lime-db:
|
||||
image: mysql:5.7
|
||||
image: docker.io/mysql:5.7
|
||||
environment:
|
||||
- "MYSQL_USER=limesurvey"
|
||||
- "MYSQL_DATABASE=limesurvey"
|
||||
|
||||
@@ -20,7 +20,7 @@ services:
|
||||
# If you require an empty table prefix, use a space as the DB_TABLE_PREFIX
|
||||
# - "DB_TABLE_PREFIX= "
|
||||
lime-db:
|
||||
image: mysql:5.7
|
||||
image: docker.io/mysql:5.7
|
||||
environment:
|
||||
- "MYSQL_USER=limesurvey"
|
||||
- "MYSQL_DATABASE=limesurvey"
|
||||
|
||||
Reference in New Issue
Block a user