Compare commits

...

69 Commits

Author SHA1 Message Date
Markus Opolka
32bd800846 Upgrading to LTS Version 3.28.49+230215 2023-02-21 17:10:18 +01:00
Markus Opolka
6709d9964f Upgrading to Version 5.6.4+230206 2023-02-14 12:48:11 +01:00
Markus Opolka
24c3f9fcd2 Upgrading to LTS Version 3.28.48+230207 2023-02-14 12:47:30 +01:00
Markus Opolka
f80cd5ce70 Upgrading to Version 5.6.3+230130 2023-02-06 16:35:45 +01:00
Markus Opolka
dae147ad6f Upgrading to LTS Version 3.28.47+230131 2023-02-06 16:35:15 +01:00
Markus Opolka
ae6de116f2 Upgrading to Version 5.6.2+230125 2023-01-31 19:08:54 +01:00
Markus Opolka
8b2b966ab2 Upgrading to LTS Version 3.28.46+230124 2023-01-31 19:08:14 +01:00
Markus Opolka
b2425303f6 Upgrading to Version 5.6.1+230123 2023-01-25 08:07:46 +01:00
Markus Opolka
ccb8047f80 Upgrading to Version 5.6.0+230116 2023-01-24 09:08:00 +01:00
Markus Opolka
66b6a31821 Upgrading to LTS Version 3.28.45+230117 2023-01-24 09:07:35 +01:00
Markus Opolka
bd81c0b44a Upgrading to Version 5.5.2+230109 2023-01-16 15:04:50 +01:00
Markus Opolka
59986c3205 Upgrading to LTS Version 3.28.44+230110 2023-01-16 15:04:28 +01:00
Markus Opolka
269774947b Upgrading to Version 5.5.1+230103 2023-01-10 08:06:09 +01:00
Markus Opolka
64f001f58c Upgrading to LTS Version 3.28.43+221221 2023-01-10 08:05:37 +01:00
Markus Opolka
142839f135 Upgrading to Version 5.5.0+221219 2023-01-04 08:52:47 +01:00
Markus Opolka
74f928b609 Upgrading to Version 5.4.15+221212 2022-12-20 08:26:56 +01:00
Markus Opolka
4877b85128 Upgrading to Version 5.4.14+221205 2022-12-12 20:33:59 +01:00
Markus Opolka
908a2817fb Upgrading to LTS Version 3.28.41+221206 2022-12-12 20:33:34 +01:00
Markus Opolka
618b89cadb Upgrading to Version 5.4.13+221128 2022-12-06 12:13:48 +01:00
Markus Opolka
da706033f6 Upgrading to LTS Version 3.28.40+221129 2022-12-06 12:13:26 +01:00
Markus Opolka
ee98ccea0c Upgrading to Version 5.4.12+221121 2022-11-28 12:22:05 +01:00
Markus Opolka
e3dcead592 Upgrading to LTS Version 3.28.39+221122 2022-11-28 12:21:35 +01:00
Markus Opolka
3c7de94fdd Upgrading to Version 5.4.11+221114 2022-11-22 08:57:51 +01:00
Markus Opolka
43a2c383ff Upgrading to LTS Version 3.28.38+221115 2022-11-22 08:57:15 +01:00
Markus Opolka
19efe662d1 Upgrading to Version 5.4.10+221107 2022-11-15 13:20:29 +01:00
Markus Opolka
51f45a8513 Upgrading to LTS Version 3.28.37+221108 2022-11-15 13:19:17 +01:00
Markus Opolka
f0b55dacf9 Update README
- Added known issues section
2022-11-15 09:44:38 +01:00
Markus Opolka
d9eb6aff10 Upgrading to Version 5.4.9+221101 2022-11-08 13:20:42 +01:00
Markus Opolka
d979eb5aa4 Upgrading to LTS Version 3.28.36+221102 2022-11-08 13:20:03 +01:00
Markus Opolka
55d9b48441 Upgrading to Version 5.4.8+221024 2022-11-02 08:31:52 +01:00
Markus Opolka
c0167b9a23 Upgrading to LTS Version 3.28.35+221025 2022-11-02 08:31:28 +01:00
Markus Opolka
6cf8fba820 Upgrading to Version 5.4.7+221019 2022-10-25 08:52:08 +02:00
Markus Opolka
e6b006edfd Upgrading to LTS Version 3.28.34+221021 2022-10-25 08:51:35 +02:00
Markus Opolka
32be5d4370 Upgrading to Version 5.4.6+221018 2022-10-19 11:35:08 +02:00
Markus Opolka
e8818f58e2 Upgrading to LTS Version 3.28.33+221020 2022-10-19 11:34:16 +02:00
Markus Opolka
c7e92149ac Upgrading to Version 5.4.5+221010 2022-10-18 11:30:06 +02:00
Markus Opolka
e8d4216266 Upgrading to Version 5.4.4+221004 2022-10-10 14:44:57 +02:00
Markus Opolka
7597951edf Upgrading to LTS Version 3.28.31+221005 2022-10-10 14:43:59 +02:00
Markus Opolka
d4d89859c1 Upgrading to Version 5.4.3+220926 2022-10-04 17:15:21 +02:00
Markus Opolka
eef6c84c91 Upgrading to LTS Version 3.28.30+220927 2022-10-04 17:14:47 +02:00
Markus Opolka
3117108a47 Upgrading to Version 5.4.2+220921 2022-09-26 14:14:10 +02:00
Markus Opolka
ce612a0bb9 Upgrading to LTS Version 3.28.29+220920 2022-09-26 14:13:45 +02:00
Markus Opolka
f094489674 Upgrading to Version 5.4.1+220919 2022-09-21 08:39:27 +02:00
Markus Opolka
12a8ba2660 Merge pull request #128 from edgarrmondragon/upgrade-5.4.0+220913
Upgrading to Version 5.4.0+220913
2022-09-19 21:17:53 +02:00
Markus Opolka
f3e7c1451a Merge pull request #129 from edgarrmondragon/upgrade-3.28.28+220912
Upgrading to LTS Version 3.28.28+220912
2022-09-19 21:11:30 +02:00
Edgar Ramírez Mondragón
66b2708e41 Upgrading to LTS Version 3.28.28+220912 2022-09-19 12:53:22 -05:00
Edgar Ramírez Mondragón
5ba0746db1 Upgrading to Version 5.4.0+220913 2022-09-19 12:52:19 -05:00
Markus Opolka
38ba19ffec Update Makefile to that Container runtime is variable 2022-09-14 15:26:08 +02:00
Markus Opolka
8d54793bf6 Upgrading to Version 5.3.32+220817 2022-09-13 12:44:01 +02:00
Markus Opolka
f8122f286c Upgrading to LTS Version 3.28.27+220905 2022-09-12 16:25:02 +02:00
Markus Opolka
93c5bff4d4 Upgrading to LTS Version 3.28.26+220829 2022-09-05 12:56:51 +02:00
Markus Opolka
b76bc10938 Upgrading to LTS Version 3.28.25+220822 2022-08-30 09:27:44 +02:00
Markus Opolka
db81ee1d42 Update CONTRIBUTING.md 2022-08-25 10:01:09 +02:00
Markus Opolka
dbb996270d Merge pull request #126 from fkr/master
escape '|' so that markdown is rendered properly.
2022-08-25 09:52:32 +02:00
Felix Kronlage-Dammers
b1a85992d7 escape '|' so that markdown is rendered properly. 2022-08-25 09:43:42 +02:00
Markus Opolka
c3f547aa3c Merge pull request #125 from martialblog/fix/images-fqdn
Change Container Image Names to FQDN
2022-08-24 09:26:45 +02:00
Markus Opolka
24ed34bc01 Change Base Container Image Names to FQDN in Dockerfiles 2022-08-24 09:21:22 +02:00
Markus Opolka
77ba4fe5e7 Change Container Image Names to FQDN in docker-compose examples 2022-08-24 09:21:18 +02:00
Markus Opolka
4077b9d0c8 Upgrading to LTS Version 3.28.24+220816 2022-08-23 08:44:52 +02:00
Markus Opolka
0ce040715c Update Makefile
- Use variable for Container Runtime, defaults to podman
2022-08-23 08:43:18 +02:00
Markus Opolka
d4072def38 Upgrading to Version 5.3.31+220815 2022-08-17 16:51:31 +02:00
Markus Opolka
8cd721ab4b Upgrading to Version 5.3.30+220808 2022-08-15 15:43:23 +02:00
Markus Opolka
76ccb812a4 Upgrading to LTS Version 3.28.23+220809 2022-08-15 15:42:20 +02:00
Markus Opolka
289e07597c Upgrading to Version 5.3.29+220801 2022-08-08 14:08:15 +02:00
Markus Opolka
10b4f482ff Upgrading to LTS Version 3.28.22+220802 2022-08-08 14:07:36 +02:00
Markus Opolka
89829181a7 Upgrading to Version 5.3.28+220727 2022-08-01 11:26:41 +02:00
Markus Opolka
0fa7cc0c28 Upgrading to LTS Version 3.28.21+220726 2022-08-01 11:25:11 +02:00
Markus Opolka
da15d218b4 Upgrading to Version 5.3.27+220725 2022-07-27 19:40:10 +02:00
Markus Opolka
fe85d3caed Upgrading to Version 5.3.26+220720 2022-07-25 13:09:14 +02:00
16 changed files with 56 additions and 38 deletions

View File

@@ -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.20+220719"
ARG sha256_checksum="44a55d6e7934cf0769823c2d6af7a668388e9fc5c722551595552175afeed197"
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

View File

@@ -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.20+220719"
ARG sha256_checksum="44a55d6e7934cf0769823c2d6af7a668388e9fc5c722551595552175afeed197"
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

View File

@@ -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.20+220719"
ARG sha256_checksum="44a55d6e7934cf0769823c2d6af7a668388e9fc5c722551595552175afeed197"
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

View File

@@ -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.25+220718"
ARG sha256_checksum="de2dcaf013a2e8c4c10d1890f5446d9933f63d0fbbd026ddc7a15ac48f259a4b"
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

View File

@@ -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.25+220718"
ARG sha256_checksum="de2dcaf013a2e8c4c10d1890f5446d9933f63d0fbbd026ddc7a15ac48f259a4b"
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

View File

@@ -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.25+220718"
ARG sha256_checksum="de2dcaf013a2e8c4c10d1890f5446d9933f63d0fbbd026ddc7a15ac48f259a4b"
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

View File

@@ -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)

View File

@@ -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

View File

@@ -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/

View File

@@ -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

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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:

View File

@@ -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"

View File

@@ -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"