mirror of
https://github.com/mykitserver/docker-limesurvey.git
synced 2025-12-06 16:39:11 +01:00
Compare commits
78 Commits
5.1.3-2108
...
5.3.9-2204
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7f69fae06e | ||
|
|
7d7f373632 | ||
|
|
148231aab6 | ||
|
|
a201933bf2 | ||
|
|
350b07dbe9 | ||
|
|
f9f651b2be | ||
|
|
8c14595423 | ||
|
|
9014e7ac6f | ||
|
|
ce253c48b8 | ||
|
|
392e28405a | ||
|
|
a6c71d5d10 | ||
|
|
d6093e43d2 | ||
|
|
2aa9153abc | ||
|
|
027a8a4589 | ||
|
|
6dd4088f7d | ||
|
|
2c2106522b | ||
|
|
b6ad489977 | ||
|
|
cb2286e6be | ||
|
|
241f855f0e | ||
|
|
7ba3ad6618 | ||
|
|
e486bf1ec6 | ||
|
|
dfb5b39211 | ||
|
|
16175a30ac | ||
|
|
69178ec686 | ||
|
|
822a936b36 | ||
|
|
99f898aedc | ||
|
|
b3bfb6f2a3 | ||
|
|
f2c65ebc44 | ||
|
|
80a9ca9173 | ||
|
|
cb13a177b6 | ||
|
|
70a86c2301 | ||
|
|
bcd42d3f63 | ||
|
|
0dbe244a9c | ||
|
|
41520cf155 | ||
|
|
4554f13f3d | ||
|
|
edea222851 | ||
|
|
0e35fa6d05 | ||
|
|
0650b759c0 | ||
|
|
7f87925fa7 | ||
|
|
71fade66fe | ||
|
|
1ff7ea366d | ||
|
|
fadbe68076 | ||
|
|
c73949610f | ||
|
|
79aea85bfe | ||
|
|
453cb4b1eb | ||
|
|
58ad34b0bd | ||
|
|
8f1b452789 | ||
|
|
19a387488a | ||
|
|
19a1a0d044 | ||
|
|
624a17b9fc | ||
|
|
21bc2e44a5 | ||
|
|
644d144f08 | ||
|
|
21d3ffceff | ||
|
|
18f6a97ed3 | ||
|
|
5d9c116b64 | ||
|
|
4b02c3c26d | ||
|
|
1676677dfc | ||
|
|
681f421d6f | ||
|
|
baab608bd9 | ||
|
|
7e1fa3eedd | ||
|
|
5a401f33f7 | ||
|
|
c3a3e77b76 | ||
|
|
d6af8e0a03 | ||
|
|
633893f9a8 | ||
|
|
3cc111f903 | ||
|
|
0d572c645c | ||
|
|
bca073774f | ||
|
|
e580c1ef45 | ||
|
|
abe42af3e2 | ||
|
|
8a8a8db556 | ||
|
|
7e3a9ad099 | ||
|
|
a57da625d7 | ||
|
|
87da3cea63 | ||
|
|
b845a1d47f | ||
|
|
9d35a25170 | ||
|
|
83b9ff0695 | ||
|
|
d12196e622 | ||
|
|
9abf028503 |
@@ -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
|
||||
latest=true
|
||||
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:
|
||||
|
||||
@@ -32,21 +32,3 @@ jobs:
|
||||
with:
|
||||
image: docker.io/martialblog/limesurvey:5-${{ matrix.context }}
|
||||
config: tests/${{ matrix.context }}-tests.yaml
|
||||
|
||||
- name: 'Run vulnerability scanner'
|
||||
uses: aquasecurity/trivy-action@master
|
||||
with:
|
||||
image-ref: docker.io/martialblog/limesurvey:5-${{ matrix.context }}
|
||||
format: 'template'
|
||||
template: '@/contrib/sarif.tpl'
|
||||
exit-code: '0'
|
||||
# Since we are not in charge of the Application
|
||||
vuln-type: 'os'
|
||||
output: trivy-results-5-${{ matrix.context }}.sarif
|
||||
severity: 'CRITICAL,HIGH'
|
||||
|
||||
- name: 'Upload Trivy scan results to GitHub'
|
||||
uses: github/codeql-action/upload-sarif@v1
|
||||
with:
|
||||
sarif_file: trivy-results-5-${{ matrix.context }}.sarif
|
||||
category: "${{ matrix.context }}"
|
||||
|
||||
18
.github/workflows/test-lts-container-images.yaml
vendored
18
.github/workflows/test-lts-container-images.yaml
vendored
@@ -32,21 +32,3 @@ jobs:
|
||||
with:
|
||||
image: docker.io/martialblog/limesurvey:3-${{ matrix.context }}
|
||||
config: tests/${{ matrix.context }}-tests.yaml
|
||||
|
||||
- name: 'Run vulnerability scanner'
|
||||
uses: aquasecurity/trivy-action@master
|
||||
with:
|
||||
image-ref: docker.io/martialblog/limesurvey:3-${{ matrix.context }}
|
||||
format: 'template'
|
||||
template: '@/contrib/sarif.tpl'
|
||||
exit-code: '0'
|
||||
# Since we are not in charge of the Application
|
||||
vuln-type: 'os'
|
||||
output: trivy-results-3-${{ matrix.context }}.sarif
|
||||
severity: 'CRITICAL,HIGH'
|
||||
|
||||
- name: 'Upload Trivy scan results to GitHub'
|
||||
uses: github/codeql-action/upload-sarif@v1
|
||||
with:
|
||||
sarif_file: trivy-results-3-${{ matrix.context }}.sarif
|
||||
category: "${{ matrix.context }}"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
FROM php:7.4-apache
|
||||
FROM php:8.0-apache
|
||||
LABEL maintainer="markus@martialblog.de"
|
||||
ARG version='3.27.12+210816'
|
||||
ARG sha256_checksum='066ee776bed2a572815bd7ab3171bb790a20eff08b57ac96d435db125cd39dd2'
|
||||
ARG version='3.28.6+220412'
|
||||
ARG sha256_checksum='d6e928deb77935ca57ef6ee670c52d33e4b4d530534b2810d40b2c4f0f456bf2'
|
||||
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"]
|
||||
|
||||
@@ -89,7 +89,7 @@ return array(
|
||||
'username' => '$DB_USERNAME',
|
||||
'password' => '$DB_PASSWORD',
|
||||
'charset' => '$DB_CHARSET',
|
||||
'tablePrefix' => '$DB_TABLE_PREFIX',
|
||||
'tablePrefix' => '${DB_TABLE_PREFIX//[[:space:]]/}',
|
||||
),
|
||||
//'session' => array (
|
||||
// 'class' => 'application.core.web.DbHttpSession',
|
||||
|
||||
@@ -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.12+210816'
|
||||
ARG sha256_checksum='066ee776bed2a572815bd7ab3171bb790a20eff08b57ac96d435db125cd39dd2'
|
||||
ARG version='3.28.6+220412'
|
||||
ARG sha256_checksum='d6e928deb77935ca57ef6ee670c52d33e4b4d530534b2810d40b2c4f0f456bf2'
|
||||
|
||||
# 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"]
|
||||
|
||||
@@ -82,7 +82,7 @@ return array(
|
||||
'username' => '$DB_USERNAME',
|
||||
'password' => '$DB_PASSWORD',
|
||||
'charset' => '$DB_CHARSET',
|
||||
'tablePrefix' => '$DB_TABLE_PREFIX',
|
||||
'tablePrefix' => '${DB_TABLE_PREFIX//[[:space:]]/}',
|
||||
),
|
||||
//'session' => array (
|
||||
// 'class' => 'application.core.web.DbHttpSession',
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
FROM php:7.4-fpm
|
||||
FROM php:8.0-fpm
|
||||
LABEL maintainer="markus@martialblog.de"
|
||||
ARG version='3.27.12+210816'
|
||||
ARG sha256_checksum='066ee776bed2a572815bd7ab3171bb790a20eff08b57ac96d435db125cd39dd2'
|
||||
ARG version='3.28.6+220412'
|
||||
ARG sha256_checksum='d6e928deb77935ca57ef6ee670c52d33e4b4d530534b2810d40b2c4f0f456bf2'
|
||||
|
||||
# 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"]
|
||||
|
||||
@@ -82,7 +82,7 @@ return array(
|
||||
'username' => '$DB_USERNAME',
|
||||
'password' => '$DB_PASSWORD',
|
||||
'charset' => '$DB_CHARSET',
|
||||
'tablePrefix' => '$DB_TABLE_PREFIX',
|
||||
'tablePrefix' => '${DB_TABLE_PREFIX//[[:space:]]/}',
|
||||
),
|
||||
//'session' => array (
|
||||
// 'class' => 'application.core.web.DbHttpSession',
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -10,6 +10,7 @@ DB_NAME=${DB_NAME:-'limesurvey'}
|
||||
DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
|
||||
DB_USERNAME=${DB_USERNAME:-'limesurvey'}
|
||||
DB_PASSWORD=${DB_PASSWORD:-}
|
||||
DB_MYSQL_ENGINE=${DB_MYSQL_ENGINE:-'MyISAM'}
|
||||
|
||||
ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
|
||||
ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
|
||||
@@ -106,6 +107,7 @@ return array(
|
||||
'publicurl'=>'$PUBLIC_URL',
|
||||
'debug'=>$DEBUG,
|
||||
'debugsql'=>$DEBUG_SQL,
|
||||
'mysqlEngine' => '$DB_MYSQL_ENGINE',
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -10,6 +10,7 @@ DB_NAME=${DB_NAME:-'limesurvey'}
|
||||
DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
|
||||
DB_USERNAME=${DB_USERNAME:-'limesurvey'}
|
||||
DB_PASSWORD=${DB_PASSWORD:-}
|
||||
DB_MYSQL_ENGINE=${DB_MYSQL_ENGINE:-'MyISAM'}
|
||||
|
||||
ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
|
||||
ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
|
||||
@@ -99,6 +100,7 @@ return array(
|
||||
'publicurl'=>'$PUBLIC_URL',
|
||||
'debug'=>$DEBUG,
|
||||
'debugsql'=>$DEBUG_SQL,
|
||||
'mysqlEngine' => '$DB_MYSQL_ENGINE',
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -10,6 +10,7 @@ DB_NAME=${DB_NAME:-'limesurvey'}
|
||||
DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
|
||||
DB_USERNAME=${DB_USERNAME:-'limesurvey'}
|
||||
DB_PASSWORD=${DB_PASSWORD:-}
|
||||
DB_MYSQL_ENGINE=${DB_MYSQL_ENGINE:-'MyISAM'}
|
||||
|
||||
ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
|
||||
ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
|
||||
@@ -99,6 +100,7 @@ return array(
|
||||
'publicurl'=>'$PUBLIC_URL',
|
||||
'debug'=>$DEBUG,
|
||||
'debugsql'=>$DEBUG_SQL,
|
||||
'mysqlEngine' => '$DB_MYSQL_ENGINE',
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
FROM php:8-apache
|
||||
FROM php:8.0-apache
|
||||
LABEL maintainer="markus@martialblog.de"
|
||||
ARG version='5.1.3+210817'
|
||||
ARG sha256_checksum='d85e0147b730085c0e82327dcdeb1c8aef837bf00da2b113bf77535c9eda5784'
|
||||
ARG version='5.3.9+220411'
|
||||
ARG sha256_checksum='28758f79bf0210028459e6a73c9931e4cdd537959e1069b4d7a004f35bb4503f'
|
||||
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"]
|
||||
|
||||
@@ -10,10 +10,13 @@ DB_NAME=${DB_NAME:-'limesurvey'}
|
||||
DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
|
||||
DB_USERNAME=${DB_USERNAME:-'limesurvey'}
|
||||
DB_PASSWORD=${DB_PASSWORD:-}
|
||||
DB_MYSQL_ENGINE=${DB_MYSQL_ENGINE:-'MyISAM'}
|
||||
|
||||
ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
|
||||
ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
|
||||
ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-}
|
||||
ENCRYPT_NONCE=${ENCRYPT_NONCE:-}
|
||||
ENCRYPT_SECRET_BOX_KEY=${ENCRYPT_SECRET_BOX_KEY:-}
|
||||
|
||||
ADMIN_USER=${ADMIN_USER:-'admin'}
|
||||
ADMIN_NAME=${ADMIN_NAME:-'admin'}
|
||||
@@ -93,7 +96,7 @@ return array(
|
||||
'username' => '$DB_USERNAME',
|
||||
'password' => '$DB_PASSWORD',
|
||||
'charset' => '$DB_CHARSET',
|
||||
'tablePrefix' => '$DB_TABLE_PREFIX',
|
||||
'tablePrefix' => '${DB_TABLE_PREFIX//[[:space:]]/}',
|
||||
),
|
||||
//'session' => array (
|
||||
// 'class' => 'application.core.web.DbHttpSession',
|
||||
@@ -113,6 +116,7 @@ return array(
|
||||
'publicurl'=>'$PUBLIC_URL',
|
||||
'debug'=>$DEBUG,
|
||||
'debugsql'=>$DEBUG_SQL,
|
||||
'mysqlEngine' => '$DB_MYSQL_ENGINE',
|
||||
)
|
||||
);
|
||||
|
||||
@@ -140,6 +144,8 @@ else
|
||||
\$config['encryptionkeypair'] = '$ENCRYPT_KEYPAIR';
|
||||
\$config['encryptionpublickey'] = '$ENCRYPT_PUBLIC_KEY';
|
||||
\$config['encryptionsecretkey'] = '$ENCRYPT_SECRET_KEY';
|
||||
\$config['encryptionnonce'] = '$ENCRYPT_NONCE';
|
||||
\$config['encryptionsecretboxkey'] = '$ENCRYPT_SECRET_BOX_KEY';
|
||||
return \$config;
|
||||
EOF
|
||||
else
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
FROM php:8-fpm-alpine
|
||||
FROM php:8.0-fpm-alpine
|
||||
LABEL maintainer="markus@martialblog.de"
|
||||
ARG version='5.1.3+210817'
|
||||
ARG sha256_checksum='d85e0147b730085c0e82327dcdeb1c8aef837bf00da2b113bf77535c9eda5784'
|
||||
ARG version='5.3.9+220411'
|
||||
ARG sha256_checksum='28758f79bf0210028459e6a73c9931e4cdd537959e1069b4d7a004f35bb4503f'
|
||||
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"]
|
||||
|
||||
@@ -10,10 +10,13 @@ DB_NAME=${DB_NAME:-'limesurvey'}
|
||||
DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
|
||||
DB_USERNAME=${DB_USERNAME:-'limesurvey'}
|
||||
DB_PASSWORD=${DB_PASSWORD:-}
|
||||
DB_MYSQL_ENGINE=${DB_MYSQL_ENGINE:-'MyISAM'}
|
||||
|
||||
ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
|
||||
ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
|
||||
ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-}
|
||||
ENCRYPT_NONCE=${ENCRYPT_NONCE:-}
|
||||
ENCRYPT_SECRET_BOX_KEY=${ENCRYPT_SECRET_BOX_KEY:-}
|
||||
|
||||
ADMIN_USER=${ADMIN_USER:-'admin'}
|
||||
ADMIN_NAME=${ADMIN_NAME:-'admin'}
|
||||
@@ -86,7 +89,7 @@ return array(
|
||||
'username' => '$DB_USERNAME',
|
||||
'password' => '$DB_PASSWORD',
|
||||
'charset' => '$DB_CHARSET',
|
||||
'tablePrefix' => '$DB_TABLE_PREFIX',
|
||||
'tablePrefix' => '${DB_TABLE_PREFIX//[[:space:]]/}',
|
||||
),
|
||||
//'session' => array (
|
||||
// 'class' => 'application.core.web.DbHttpSession',
|
||||
@@ -106,6 +109,7 @@ return array(
|
||||
'publicurl'=>'$PUBLIC_URL',
|
||||
'debug'=>$DEBUG,
|
||||
'debugsql'=>$DEBUG_SQL,
|
||||
'mysqlEngine' => '$DB_MYSQL_ENGINE',
|
||||
)
|
||||
);
|
||||
|
||||
@@ -133,6 +137,8 @@ else
|
||||
\$config['encryptionkeypair'] = '$ENCRYPT_KEYPAIR';
|
||||
\$config['encryptionpublickey'] = '$ENCRYPT_PUBLIC_KEY';
|
||||
\$config['encryptionsecretkey'] = '$ENCRYPT_SECRET_KEY';
|
||||
\$config['encryptionnonce'] = '$ENCRYPT_NONCE';
|
||||
\$config['encryptionsecretboxkey'] = '$ENCRYPT_SECRET_BOX_KEY';
|
||||
return \$config;
|
||||
EOF
|
||||
else
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
FROM php:8-fpm
|
||||
FROM php:8.0-fpm
|
||||
LABEL maintainer="markus@martialblog.de"
|
||||
ARG version='5.1.3+210817'
|
||||
ARG sha256_checksum='d85e0147b730085c0e82327dcdeb1c8aef837bf00da2b113bf77535c9eda5784'
|
||||
ARG version='5.3.9+220411'
|
||||
ARG sha256_checksum='28758f79bf0210028459e6a73c9931e4cdd537959e1069b4d7a004f35bb4503f'
|
||||
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"]
|
||||
|
||||
@@ -10,10 +10,13 @@ DB_NAME=${DB_NAME:-'limesurvey'}
|
||||
DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
|
||||
DB_USERNAME=${DB_USERNAME:-'limesurvey'}
|
||||
DB_PASSWORD=${DB_PASSWORD:-}
|
||||
DB_MYSQL_ENGINE=${DB_MYSQL_ENGINE:-'MyISAM'}
|
||||
|
||||
ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
|
||||
ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
|
||||
ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-}
|
||||
ENCRYPT_NONCE=${ENCRYPT_NONCE:-}
|
||||
ENCRYPT_SECRET_BOX_KEY=${ENCRYPT_SECRET_BOX_KEY:-}
|
||||
|
||||
ADMIN_USER=${ADMIN_USER:-'admin'}
|
||||
ADMIN_NAME=${ADMIN_NAME:-'admin'}
|
||||
@@ -86,7 +89,7 @@ return array(
|
||||
'username' => '$DB_USERNAME',
|
||||
'password' => '$DB_PASSWORD',
|
||||
'charset' => '$DB_CHARSET',
|
||||
'tablePrefix' => '$DB_TABLE_PREFIX',
|
||||
'tablePrefix' => '${DB_TABLE_PREFIX//[[:space:]]/}',
|
||||
),
|
||||
//'session' => array (
|
||||
// 'class' => 'application.core.web.DbHttpSession',
|
||||
@@ -106,6 +109,7 @@ return array(
|
||||
'publicurl'=>'$PUBLIC_URL',
|
||||
'debug'=>$DEBUG,
|
||||
'debugsql'=>$DEBUG_SQL,
|
||||
'mysqlEngine' => '$DB_MYSQL_ENGINE',
|
||||
)
|
||||
);
|
||||
|
||||
@@ -133,6 +137,8 @@ else
|
||||
\$config['encryptionkeypair'] = '$ENCRYPT_KEYPAIR';
|
||||
\$config['encryptionpublickey'] = '$ENCRYPT_PUBLIC_KEY';
|
||||
\$config['encryptionsecretkey'] = '$ENCRYPT_SECRET_KEY';
|
||||
\$config['encryptionnonce'] = '$ENCRYPT_NONCE';
|
||||
\$config['encryptionsecretboxkey'] = '$ENCRYPT_SECRET_BOX_KEY';
|
||||
return \$config;
|
||||
EOF
|
||||
else
|
||||
@@ -153,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`)",
|
||||
@@ -103,7 +105,8 @@ For further details on the settings see: https://manual.limesurvey.org/Data_encr
|
||||
| DB_PORT | Database server port |
|
||||
| DB_SOCK | Database unix socket instead of host/port |
|
||||
| DB_NAME | Database name |
|
||||
| DB_TABLE_PREFIX | Database table prefix |
|
||||
| DB_TABLE_PREFIX | Database table prefix; set this to a single whitespace if you don't want a table prefix. |
|
||||
| DB_MYSQL_ENGINE | MySQL engine used for survey tables (values: MyISAM, InnoDB, default: MyISAM) |
|
||||
| DB_USERNAME | Database user |
|
||||
| DB_PASSWORD | Database user's password |
|
||||
| ADMIN_USER | Initial LimeSurvey Admin User |
|
||||
@@ -120,6 +123,8 @@ For further details on the settings see: https://manual.limesurvey.org/Data_encr
|
||||
| ENCRYPT_KEYPAIR | Data encryption keypair |
|
||||
| ENCRYPT_PUBLIC_KEY | Data encryption public key |
|
||||
| ENCRYPT_SECRET_KEY | Data encryption secret key |
|
||||
| ENCRYPT_NONCE | Data encryption nonce (used in 5.0) |
|
||||
| ENCRYPT_SECRET_BOX_KEY | Data encryption secret box key (used in 5.0) |
|
||||
| LISTEN_PORT | Apache: Listen port. Default: 8080 |
|
||||
|
||||
For further details on the settings see: https://manual.limesurvey.org/Optional_settings#Advanced_Path_Settings
|
||||
|
||||
@@ -20,6 +20,8 @@ services:
|
||||
image: nginx:alpine
|
||||
links:
|
||||
- limesurvey
|
||||
depends_on:
|
||||
- limesurvey
|
||||
ports:
|
||||
- "8080:80"
|
||||
volumes:
|
||||
|
||||
@@ -2,6 +2,7 @@ version: "3.0"
|
||||
services:
|
||||
limesurvey:
|
||||
build:
|
||||
# Hint: Change it to 3.0/apache/ if you want to use LimeSurvey 3.*
|
||||
context: 5.0/apache/
|
||||
dockerfile: Dockerfile
|
||||
volumes:
|
||||
@@ -12,6 +13,7 @@ services:
|
||||
depends_on:
|
||||
- lime-db
|
||||
ports:
|
||||
# Hint: Change it to 80:8080 if you are using LimeSurvey 3.*
|
||||
- "8080:8080"
|
||||
environment:
|
||||
- "DB_TYPE=pgsql"
|
||||
@@ -22,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"
|
||||
|
||||
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"
|
||||
|
||||
@@ -17,6 +17,8 @@ services:
|
||||
- "DB_HOST=lime-db"
|
||||
- "DB_PASSWORD=secret"
|
||||
- "ADMIN_PASSWORD=foobar"
|
||||
# If you require an empty table prefix, use a space as the DB_TABLE_PREFIX
|
||||
# - "DB_TABLE_PREFIX= "
|
||||
lime-db:
|
||||
image: mysql:5.7
|
||||
environment:
|
||||
|
||||
@@ -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)$ {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
|
||||
cert_path=/etc/letsencrypt/live/$(echo "$HOSTNAMES" | awk '{print $1}')
|
||||
mkdir -p cert_path
|
||||
mkdir -p $cert_path
|
||||
|
||||
# if there is no certificate yet, get one
|
||||
email="--email $CERT_EMAIL"
|
||||
@@ -19,7 +19,7 @@ then
|
||||
echo "Getting new certificate..."
|
||||
/usr/bin/curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx.conf > /etc/letsencrypt/options-ssl-nginx.conf
|
||||
/usr/bin/curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot/certbot/ssl-dhparams.pem > /etc/letsencrypt/ssl-dhparams.pem
|
||||
/usr/bin/certbot certonly --standalone "$names" --agree-tos "$email"
|
||||
/usr/bin/certbot certonly --standalone $names --agree-tos "$email"
|
||||
fi
|
||||
|
||||
nginx -g "daemon off;"
|
||||
|
||||
@@ -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