mirror of
https://github.com/mykitserver/docker-limesurvey.git
synced 2025-12-06 16:39:11 +01:00
Compare commits
13 Commits
5.2.2-2111
...
3.27.27-21
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0650b759c0 | ||
|
|
7f87925fa7 | ||
|
|
71fade66fe | ||
|
|
1ff7ea366d | ||
|
|
fadbe68076 | ||
|
|
c73949610f | ||
|
|
79aea85bfe | ||
|
|
453cb4b1eb | ||
|
|
58ad34b0bd | ||
|
|
8f1b452789 | ||
|
|
19a387488a | ||
|
|
19a1a0d044 | ||
|
|
624a17b9fc |
@@ -49,10 +49,11 @@ jobs:
|
||||
images: |
|
||||
docker.io/martialblog/limesurvey
|
||||
tags: |
|
||||
type=semver,pattern={{raw}},suffix=-apache
|
||||
type=semver,pattern={{major}},suffix=-apache
|
||||
type=match,pattern=(.+),group=1
|
||||
type=match,pattern=^(\d+),group=1
|
||||
flavor: |
|
||||
latest=false
|
||||
suffix=-apache
|
||||
- name: 'Build and push latest Apache container images'
|
||||
uses: docker/build-push-action@v2
|
||||
with:
|
||||
@@ -68,8 +69,11 @@ jobs:
|
||||
images: |
|
||||
docker.io/martialblog/limesurvey
|
||||
tags: |
|
||||
type=semver,pattern={{version}},suffix=-fpm
|
||||
type=semver,pattern={{major}},suffix=-fpm
|
||||
type=match,pattern=(.+),group=1
|
||||
type=match,pattern=^(\d+),group=1
|
||||
flavor: |
|
||||
latest=false
|
||||
suffix=-fpm
|
||||
- name: 'Build and push latest fpm container images'
|
||||
uses: docker/build-push-action@v2
|
||||
with:
|
||||
@@ -85,8 +89,11 @@ jobs:
|
||||
images: |
|
||||
docker.io/martialblog/limesurvey
|
||||
tags: |
|
||||
type=semver,pattern={{version}},suffix=-fpm-alpine
|
||||
type=semver,pattern={{major}},suffix=-fpm-alpine
|
||||
type=match,pattern=(.+),group=1
|
||||
type=match,pattern=^(\d+),group=1
|
||||
flavor: |
|
||||
latest=false
|
||||
suffix=-fpm-alpine
|
||||
- name: 'Build and push latest fpm-alpine container images'
|
||||
uses: docker/build-push-action@v2
|
||||
with:
|
||||
|
||||
@@ -49,10 +49,11 @@ jobs:
|
||||
images: |
|
||||
docker.io/martialblog/limesurvey
|
||||
tags: |
|
||||
type=semver,pattern={{raw}},suffix=-apache
|
||||
type=semver,pattern={{major}},suffix=-apache
|
||||
type=match,pattern=(.+),group=1
|
||||
type=match,pattern=^(\d+),group=1
|
||||
flavor: |
|
||||
latest=false
|
||||
suffix=-apache
|
||||
- name: 'Build and push LTS apache container images'
|
||||
uses: docker/build-push-action@v2
|
||||
with:
|
||||
@@ -68,8 +69,11 @@ jobs:
|
||||
images: |
|
||||
docker.io/martialblog/limesurvey
|
||||
tags: |
|
||||
type=semver,pattern={{version}},suffix=-fpm
|
||||
type=semver,pattern={{major}},suffix=-fpm
|
||||
type=match,pattern=(.+),group=1
|
||||
type=match,pattern=^(\d+),group=1
|
||||
flavor: |
|
||||
latest=false
|
||||
suffix=-fpm
|
||||
- name: 'Build and push LTS fpm container images'
|
||||
uses: docker/build-push-action@v2
|
||||
with:
|
||||
@@ -85,8 +89,11 @@ jobs:
|
||||
images: |
|
||||
docker.io/martialblog/limesurvey
|
||||
tags: |
|
||||
type=semver,pattern={{version}},suffix=-fpm-alpine
|
||||
type=semver,pattern={{major}},suffix=-fpm-alpine
|
||||
type=match,pattern=(.+),group=1
|
||||
type=match,pattern=^(\d+),group=1
|
||||
flavor: |
|
||||
latest=false
|
||||
suffix=-fpm-alpine
|
||||
- name: 'Build and push LTS fpm-alpine container images'
|
||||
uses: docker/build-push-action@v2
|
||||
with:
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
FROM php:7.4-apache
|
||||
FROM php:8.0-apache
|
||||
LABEL maintainer="markus@martialblog.de"
|
||||
ARG version='3.27.25+211116'
|
||||
ARG sha256_checksum='91ecfecffc3a437dbb14dec19054d64f07849fe1de00a1322699bd1f50185582'
|
||||
ARG version='3.27.27+211130'
|
||||
ARG sha256_checksum='ac6c85b801dededfa4325ab47f7690800ed82b0aa642ded9a27920015c75c8f6'
|
||||
ARG USER=root
|
||||
ARG LISTEN_PORT=80
|
||||
|
||||
@@ -75,8 +75,8 @@ RUN set -ex; \
|
||||
chown -R www-data:www-data /var/www/html /etc/apache2
|
||||
|
||||
WORKDIR /var/www/html
|
||||
COPY entrypoint.sh entrypoint.sh
|
||||
COPY entrypoint.sh /usr/local/bin/entrypoint.sh
|
||||
COPY vhosts-access-log.conf /etc/apache2/conf-enabled/other-vhosts-access-log.conf
|
||||
USER $USER
|
||||
ENTRYPOINT ["/var/www/html/entrypoint.sh"]
|
||||
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
|
||||
CMD ["apache2-foreground"]
|
||||
|
||||
@@ -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.25+211116'
|
||||
ARG sha256_checksum='91ecfecffc3a437dbb14dec19054d64f07849fe1de00a1322699bd1f50185582'
|
||||
ARG version='3.27.27+211130'
|
||||
ARG sha256_checksum='ac6c85b801dededfa4325ab47f7690800ed82b0aa642ded9a27920015c75c8f6'
|
||||
|
||||
# Install OS dependencies
|
||||
RUN set -ex; \
|
||||
@@ -52,6 +52,6 @@ RUN set -ex; \
|
||||
EXPOSE 9000
|
||||
|
||||
WORKDIR /var/www/html
|
||||
COPY entrypoint.sh entrypoint.sh
|
||||
ENTRYPOINT ["/var/www/html/entrypoint.sh"]
|
||||
COPY entrypoint.sh /usr/local/bin/entrypoint.sh
|
||||
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
|
||||
CMD ["php-fpm"]
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
FROM php:7.4-fpm
|
||||
FROM php:8.0-fpm
|
||||
LABEL maintainer="markus@martialblog.de"
|
||||
ARG version='3.27.25+211116'
|
||||
ARG sha256_checksum='91ecfecffc3a437dbb14dec19054d64f07849fe1de00a1322699bd1f50185582'
|
||||
ARG version='3.27.27+211130'
|
||||
ARG sha256_checksum='ac6c85b801dededfa4325ab47f7690800ed82b0aa642ded9a27920015c75c8f6'
|
||||
|
||||
# Install OS dependencies
|
||||
RUN set -ex; \
|
||||
@@ -62,6 +62,6 @@ RUN set -ex; \
|
||||
EXPOSE 9000
|
||||
|
||||
WORKDIR /var/www/html
|
||||
COPY entrypoint.sh entrypoint.sh
|
||||
ENTRYPOINT ["/var/www/html/entrypoint.sh"]
|
||||
COPY entrypoint.sh /usr/local/bin/entrypoint.sh
|
||||
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
|
||||
CMD ["php-fpm"]
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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.3+211122'
|
||||
ARG sha256_checksum='5a5bf3bbc1cc3ddff943e377dfdcb5469a5e5f4532fdc6b43261e7494d82f406'
|
||||
ARG USER=www-data
|
||||
ARG LISTEN_PORT=8080
|
||||
|
||||
@@ -78,8 +78,8 @@ RUN set -ex; \
|
||||
EXPOSE $LISTEN_PORT
|
||||
|
||||
WORKDIR /var/www/html
|
||||
COPY entrypoint.sh entrypoint.sh
|
||||
COPY entrypoint.sh /usr/local/bin/entrypoint.sh
|
||||
COPY vhosts-access-log.conf /etc/apache2/conf-enabled/other-vhosts-access-log.conf
|
||||
USER $USER
|
||||
ENTRYPOINT ["/var/www/html/entrypoint.sh"]
|
||||
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
|
||||
CMD ["apache2-foreground"]
|
||||
|
||||
@@ -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.3+211122'
|
||||
ARG sha256_checksum='5a5bf3bbc1cc3ddff943e377dfdcb5469a5e5f4532fdc6b43261e7494d82f406'
|
||||
ARG USER=www-data
|
||||
|
||||
# Install OS dependencies
|
||||
@@ -54,7 +54,7 @@ RUN set -ex; \
|
||||
EXPOSE 9000
|
||||
|
||||
WORKDIR /var/www/html
|
||||
COPY entrypoint.sh entrypoint.sh
|
||||
COPY entrypoint.sh /usr/local/bin/entrypoint.sh
|
||||
USER $USER
|
||||
ENTRYPOINT ["/var/www/html/entrypoint.sh"]
|
||||
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
|
||||
CMD ["php-fpm"]
|
||||
|
||||
@@ -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.3+211122'
|
||||
ARG sha256_checksum='5a5bf3bbc1cc3ddff943e377dfdcb5469a5e5f4532fdc6b43261e7494d82f406'
|
||||
ARG USER=www-data
|
||||
|
||||
# Install OS dependencies
|
||||
@@ -63,7 +63,7 @@ RUN set -ex; \
|
||||
EXPOSE 9000
|
||||
|
||||
WORKDIR /var/www/html
|
||||
COPY entrypoint.sh entrypoint.sh
|
||||
COPY entrypoint.sh /usr/local/bin/entrypoint.sh
|
||||
USER $USER
|
||||
ENTRYPOINT ["/var/www/html/entrypoint.sh"]
|
||||
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
|
||||
CMD ["php-fpm"]
|
||||
|
||||
@@ -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 "$@"
|
||||
|
||||
@@ -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`)",
|
||||
|
||||
@@ -20,6 +20,8 @@ services:
|
||||
image: nginx:alpine
|
||||
links:
|
||||
- limesurvey
|
||||
depends_on:
|
||||
- limesurvey
|
||||
ports:
|
||||
- "8080:80"
|
||||
volumes:
|
||||
|
||||
46
docker-compose.traefik.yml
Normal file
46
docker-compose.traefik.yml
Normal 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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -19,7 +19,7 @@ http {
|
||||
location / {
|
||||
try_files $uri /index.php?$args;
|
||||
}
|
||||
location ~ ^/(protected|framework|themes/\w+/views) {
|
||||
location ~ ^/(protected|application|framework|themes/\w+/views) {
|
||||
deny all;
|
||||
}
|
||||
location ~ \.(js|css|png|jpg|gif|swf|ico|pdf|mov|fla|zip|rar)$ {
|
||||
|
||||
@@ -9,7 +9,7 @@ fileContentTests:
|
||||
path: '/var/www/html/admin/index.php'
|
||||
expectedContents: ['LimeSurvey']
|
||||
- name: 'Entrypoint file content'
|
||||
path: '/var/www/html/entrypoint.sh'
|
||||
path: '/usr/local/bin/entrypoint.sh'
|
||||
expectedContents: ['console.php', 'ADMIN_USER']
|
||||
|
||||
fileExistenceTests:
|
||||
|
||||
@@ -9,7 +9,7 @@ fileContentTests:
|
||||
path: '/var/www/html/admin/index.php'
|
||||
expectedContents: ['LimeSurvey']
|
||||
- name: 'Entrypoint file content'
|
||||
path: '/var/www/html/entrypoint.sh'
|
||||
path: '/usr/local/bin/entrypoint.sh'
|
||||
expectedContents: ['console.php', 'ADMIN_USER']
|
||||
|
||||
fileExistenceTests:
|
||||
|
||||
Reference in New Issue
Block a user