mirror of
https://github.com/mykitserver/docker-limesurvey.git
synced 2025-12-06 16:39:11 +01:00
Compare commits
169 Commits
5.2.9-2201
...
6.0.5-2305
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
281cc199aa | ||
|
|
d15b0a2693 | ||
|
|
164767fe97 | ||
|
|
0478c67f4a | ||
|
|
07fea8dfcc | ||
|
|
4250f57653 | ||
|
|
919627c293 | ||
|
|
964ed7b38e | ||
|
|
9b1ee53a4a | ||
|
|
d3c5ed4e35 | ||
|
|
b1b32c2380 | ||
|
|
f79d1e3a9d | ||
|
|
bfa8bbb85a | ||
|
|
9ff5cdf1cb | ||
|
|
3552c1b90d | ||
|
|
76a7f28105 | ||
|
|
36d49a4fbb | ||
|
|
b9c9c3f854 | ||
|
|
6e06dec555 | ||
|
|
b9627cda92 | ||
|
|
0d5d7e6e4d | ||
|
|
eb3f48b0dc | ||
|
|
2f82a36dc0 | ||
|
|
128e7b4595 | ||
|
|
663bf2f03b | ||
|
|
0732424f79 | ||
|
|
1c709f7780 | ||
|
|
b4ec3009b6 | ||
|
|
5150ab73cf | ||
|
|
2bf13290c7 | ||
|
|
6014fc72df | ||
|
|
25ab1cb849 | ||
|
|
d777bfc285 | ||
|
|
2498c148e3 | ||
|
|
c1e931ee8f | ||
|
|
e694afe33e | ||
|
|
8ecd8012c5 | ||
|
|
e3671f0dc2 | ||
|
|
8d77a697df | ||
|
|
8e78295423 | ||
|
|
1bbcede235 | ||
|
|
2fb47a0151 | ||
|
|
827fb0f6e0 | ||
|
|
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 | ||
|
|
1f1dc5988c | ||
|
|
d1589be66e | ||
|
|
d70f6e96a2 | ||
|
|
ab4999ce35 | ||
|
|
316121af13 | ||
|
|
34416fb250 | ||
|
|
e640684875 | ||
|
|
e8595fbbed | ||
|
|
a107e3a14f | ||
|
|
69a0febd53 | ||
|
|
2a8c53273e | ||
|
|
882cc50e81 | ||
|
|
1d3081acd7 | ||
|
|
0d13763a47 | ||
|
|
7ee31a96ec | ||
|
|
f5da02dd55 | ||
|
|
952a15d298 | ||
|
|
ce31f52f54 | ||
|
|
4d22afc2f3 | ||
|
|
2dff0b1c02 | ||
|
|
d817d2c56d | ||
|
|
26291e176b | ||
|
|
b00c7b146a | ||
|
|
a45bcd926d | ||
|
|
c1c16c5395 | ||
|
|
afbe9787e0 | ||
|
|
9af1d036cc | ||
|
|
be5896458a | ||
|
|
c30fa9344c | ||
|
|
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 |
9
.github/renovate.json
vendored
Normal file
9
.github/renovate.json
vendored
Normal file
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"extends": [
|
||||
"config:base"
|
||||
],
|
||||
"enabledManagers": ["dockerfile", "github-actions"],
|
||||
"dockerfile": {
|
||||
"ignorePaths": ["4.0", "nginx-certbot"]
|
||||
}
|
||||
}
|
||||
@@ -2,7 +2,7 @@ name: Publish Latest Container Images
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- '5.*'
|
||||
- '6.*'
|
||||
|
||||
jobs:
|
||||
lint_dockerfiles:
|
||||
@@ -11,15 +11,15 @@ jobs:
|
||||
strategy:
|
||||
matrix:
|
||||
dockerfile:
|
||||
- 5.0/apache/Dockerfile
|
||||
- 5.0/fpm-alpine/Dockerfile
|
||||
- 5.0/fpm/Dockerfile
|
||||
- 6.0/apache/Dockerfile
|
||||
- 6.0/fpm-alpine/Dockerfile
|
||||
- 6.0/fpm/Dockerfile
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: hadolint/hadolint-action@v1.5.0
|
||||
- uses: actions/checkout@v3
|
||||
- uses: hadolint/hadolint-action@v3.1.0
|
||||
with:
|
||||
dockerfile: ${{ matrix.dockerfile }}
|
||||
ignore: DL4006 DL3008 DL3018
|
||||
ignore: "DL4006,DL3008,DL3018"
|
||||
|
||||
push_images_to_registries:
|
||||
name: Push Container Images to registries
|
||||
@@ -31,20 +31,24 @@ jobs:
|
||||
contents: read
|
||||
steps:
|
||||
- name: 'Check out the repo'
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
- name: 'Set up QEMU'
|
||||
uses: docker/setup-qemu-action@v2
|
||||
with:
|
||||
platforms: 'arm64,arm'
|
||||
- name: 'Set up Docker Buildx'
|
||||
uses: docker/setup-buildx-action@v1
|
||||
uses: docker/setup-buildx-action@v2
|
||||
with:
|
||||
buildkitd-flags: --debug
|
||||
- name: 'Log in to DockerHub'
|
||||
if: github.event_name != 'pull_request'
|
||||
uses: docker/login-action@v1
|
||||
uses: docker/login-action@v2
|
||||
with:
|
||||
username: ${{ secrets.DOCKER_USERNAME }}
|
||||
password: ${{ secrets.DOCKER_HUB_TOKEN }}
|
||||
- name: 'Apache variant metadata'
|
||||
id: metadata-apache
|
||||
uses: docker/metadata-action@v3
|
||||
uses: docker/metadata-action@v4
|
||||
with:
|
||||
images: |
|
||||
docker.io/martialblog/limesurvey
|
||||
@@ -55,16 +59,17 @@ jobs:
|
||||
latest=true
|
||||
suffix=-apache
|
||||
- name: 'Build and push latest Apache container images'
|
||||
uses: docker/build-push-action@v2
|
||||
uses: docker/build-push-action@v4
|
||||
with:
|
||||
context: 5.0/apache
|
||||
context: 6.0/apache
|
||||
push: true
|
||||
tags: ${{ steps.metadata-apache.outputs.tags }}
|
||||
labels: ${{ steps.metadata-apache.outputs.labels }}
|
||||
platforms: linux/amd64,linux/arm64
|
||||
|
||||
- name: 'FPM variant metadata'
|
||||
id: metadata-fpm
|
||||
uses: docker/metadata-action@v3
|
||||
uses: docker/metadata-action@v4
|
||||
with:
|
||||
images: |
|
||||
docker.io/martialblog/limesurvey
|
||||
@@ -75,16 +80,17 @@ jobs:
|
||||
latest=false
|
||||
suffix=-fpm
|
||||
- name: 'Build and push latest fpm container images'
|
||||
uses: docker/build-push-action@v2
|
||||
uses: docker/build-push-action@v4
|
||||
with:
|
||||
context: 5.0/fpm
|
||||
context: 6.0/fpm
|
||||
push: true
|
||||
tags: ${{ steps.metadata-fpm.outputs.tags }}
|
||||
labels: ${{ steps.metadata-fpm.outputs.labels }}
|
||||
platforms: linux/amd64,linux/arm64
|
||||
|
||||
- name: 'FPM Alpine variant metadata'
|
||||
id: metadata-fpm-alpine
|
||||
uses: docker/metadata-action@v3
|
||||
uses: docker/metadata-action@v4
|
||||
with:
|
||||
images: |
|
||||
docker.io/martialblog/limesurvey
|
||||
@@ -95,9 +101,10 @@ jobs:
|
||||
latest=false
|
||||
suffix=-fpm-alpine
|
||||
- name: 'Build and push latest fpm-alpine container images'
|
||||
uses: docker/build-push-action@v2
|
||||
uses: docker/build-push-action@v4
|
||||
with:
|
||||
context: 5.0/fpm-alpine
|
||||
context: 6.0/fpm-alpine
|
||||
push: true
|
||||
tags: ${{ steps.metadata-fpm-alpine.outputs.tags }}
|
||||
labels: ${{ steps.metadata-fpm-alpine.outputs.labels }}
|
||||
platforms: linux/amd64,linux/arm64
|
||||
|
||||
@@ -2,7 +2,7 @@ name: Publish LTS Container Images
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- '3.*'
|
||||
- '5.*'
|
||||
|
||||
jobs:
|
||||
lint_dockerfiles:
|
||||
@@ -11,15 +11,15 @@ jobs:
|
||||
strategy:
|
||||
matrix:
|
||||
dockerfile:
|
||||
- 3.0/apache/Dockerfile
|
||||
- 3.0/fpm-alpine/Dockerfile
|
||||
- 3.0/fpm/Dockerfile
|
||||
- 5.0/apache/Dockerfile
|
||||
- 5.0/fpm-alpine/Dockerfile
|
||||
- 5.0/fpm/Dockerfile
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: hadolint/hadolint-action@v1.5.0
|
||||
- uses: actions/checkout@v3
|
||||
- uses: hadolint/hadolint-action@v3.1.0
|
||||
with:
|
||||
dockerfile: ${{ matrix.dockerfile }}
|
||||
ignore: DL4006 DL3008 DL3018
|
||||
ignore: "DL4006,DL3008,DL3018"
|
||||
|
||||
push_images_to_registries:
|
||||
name: 'Push container images to registries'
|
||||
@@ -31,20 +31,24 @@ jobs:
|
||||
contents: read
|
||||
steps:
|
||||
- name: 'Check out the repo'
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
- name: 'Set up QEMU'
|
||||
uses: docker/setup-qemu-action@v2
|
||||
with:
|
||||
platforms: 'arm64,arm'
|
||||
- name: 'Set up Docker Buildx'
|
||||
uses: docker/setup-buildx-action@v1
|
||||
uses: docker/setup-buildx-action@v2
|
||||
with:
|
||||
buildkitd-flags: --debug
|
||||
- name: 'Log in to DockerHub'
|
||||
if: github.event_name != 'pull_request'
|
||||
uses: docker/login-action@v1
|
||||
uses: docker/login-action@v2
|
||||
with:
|
||||
username: ${{ secrets.DOCKER_USERNAME }}
|
||||
password: ${{ secrets.DOCKER_HUB_TOKEN }}
|
||||
- name: 'Apache variant metadata'
|
||||
id: metadata-apache
|
||||
uses: docker/metadata-action@v3
|
||||
uses: docker/metadata-action@v4
|
||||
with:
|
||||
images: |
|
||||
docker.io/martialblog/limesurvey
|
||||
@@ -55,16 +59,17 @@ jobs:
|
||||
latest=false
|
||||
suffix=-apache
|
||||
- name: 'Build and push LTS apache container images'
|
||||
uses: docker/build-push-action@v2
|
||||
uses: docker/build-push-action@v4
|
||||
with:
|
||||
context: 3.0/apache
|
||||
context: 5.0/apache
|
||||
push: true
|
||||
tags: ${{ steps.metadata-apache.outputs.tags }}
|
||||
labels: ${{ steps.metadata-apache.outputs.labels }}
|
||||
platforms: linux/amd64,linux/arm64
|
||||
|
||||
- name: 'FPM variant metadata'
|
||||
id: metadata-fpm
|
||||
uses: docker/metadata-action@v3
|
||||
uses: docker/metadata-action@v4
|
||||
with:
|
||||
images: |
|
||||
docker.io/martialblog/limesurvey
|
||||
@@ -75,16 +80,17 @@ jobs:
|
||||
latest=false
|
||||
suffix=-fpm
|
||||
- name: 'Build and push LTS fpm container images'
|
||||
uses: docker/build-push-action@v2
|
||||
uses: docker/build-push-action@v4
|
||||
with:
|
||||
context: 3.0/fpm
|
||||
context: 5.0/fpm
|
||||
push: true
|
||||
tags: ${{ steps.metadata-fpm.outputs.tags }}
|
||||
labels: ${{ steps.metadata-apache.outputs.labels }}
|
||||
platforms: linux/amd64,linux/arm64
|
||||
|
||||
- name: 'FPM Alpine variant metadata'
|
||||
id: metadata-fpm-alpine
|
||||
uses: docker/metadata-action@v3
|
||||
uses: docker/metadata-action@v4
|
||||
with:
|
||||
images: |
|
||||
docker.io/martialblog/limesurvey
|
||||
@@ -95,9 +101,10 @@ jobs:
|
||||
latest=false
|
||||
suffix=-fpm-alpine
|
||||
- name: 'Build and push LTS fpm-alpine container images'
|
||||
uses: docker/build-push-action@v2
|
||||
uses: docker/build-push-action@v4
|
||||
with:
|
||||
context: 3.0/fpm-alpine
|
||||
context: 5.0/fpm-alpine
|
||||
push: true
|
||||
tags: ${{ steps.metadata-fpm-alpine.outputs.tags }}
|
||||
labels: ${{ steps.metadata-apache.outputs.labels }}
|
||||
platforms: linux/amd64,linux/arm64
|
||||
|
||||
12
.github/workflows/lint-dockerfiles.yaml
vendored
12
.github/workflows/lint-dockerfiles.yaml
vendored
@@ -9,16 +9,16 @@ jobs:
|
||||
strategy:
|
||||
matrix:
|
||||
dockerfile:
|
||||
- 3.0/apache/Dockerfile
|
||||
- 3.0/fpm-alpine/Dockerfile
|
||||
- 3.0/fpm/Dockerfile
|
||||
- 5.0/apache/Dockerfile
|
||||
- 5.0/fpm-alpine/Dockerfile
|
||||
- 5.0/fpm/Dockerfile
|
||||
- 6.0/apache/Dockerfile
|
||||
- 6.0/fpm-alpine/Dockerfile
|
||||
- 6.0/fpm/Dockerfile
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: hadolint/hadolint-action@v1.5.0
|
||||
- uses: actions/checkout@v3
|
||||
- uses: hadolint/hadolint-action@v3.1.0
|
||||
with:
|
||||
dockerfile: ${{ matrix.dockerfile }}
|
||||
ignore: DL4006 DL3008 DL3018
|
||||
ignore: "DL4006,DL3008,DL3018"
|
||||
|
||||
48
.github/workflows/test-arm-container-images.yaml
vendored
Normal file
48
.github/workflows/test-arm-container-images.yaml
vendored
Normal file
@@ -0,0 +1,48 @@
|
||||
name: Test ARM Container Images
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- 'arm/**'
|
||||
pull_request:
|
||||
branches:
|
||||
- 'arm/**'
|
||||
|
||||
jobs:
|
||||
test_images:
|
||||
name: Test Latest Container Images
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
context:
|
||||
- apache
|
||||
- fpm-alpine
|
||||
- fpm
|
||||
platform:
|
||||
- linux/arm64
|
||||
steps:
|
||||
- name: 'Check out the repo'
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: 'Set up QEMU'
|
||||
uses: docker/setup-qemu-action@v2
|
||||
with:
|
||||
platforms: 'arm64,arm'
|
||||
|
||||
- name: 'Set up Docker Buildx'
|
||||
uses: docker/setup-buildx-action@v2
|
||||
|
||||
- name: 'Build Container images'
|
||||
uses: docker/build-push-action@v4
|
||||
with:
|
||||
context: 6.0/${{ matrix.context }}
|
||||
push: false
|
||||
load: true
|
||||
tags: docker.io/martialblog/limesurvey:6-${{ matrix.context }}
|
||||
platforms: ${{ matrix.platform }}
|
||||
|
||||
- name: 'Run Structure tests'
|
||||
uses: plexsystems/container-structure-test-action@v0.3.0
|
||||
with:
|
||||
image: docker.io/martialblog/limesurvey:6-${{ matrix.context }}
|
||||
config: tests/${{ matrix.context }}-tests.yaml
|
||||
@@ -4,7 +4,7 @@ on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
test_images:
|
||||
name: Test Latest Container Images with Trivy
|
||||
name: Test Latest Container Images
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
@@ -14,21 +14,26 @@ jobs:
|
||||
- fpm
|
||||
steps:
|
||||
- name: 'Check out the repo'
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: 'Set up QEMU'
|
||||
uses: docker/setup-qemu-action@v2
|
||||
with:
|
||||
platforms: 'arm64,arm'
|
||||
|
||||
- name: 'Set up Docker Buildx'
|
||||
uses: docker/setup-buildx-action@v1
|
||||
uses: docker/setup-buildx-action@v2
|
||||
|
||||
- name: 'Build Container images'
|
||||
uses: docker/build-push-action@v2
|
||||
uses: docker/build-push-action@v4
|
||||
with:
|
||||
context: 5.0/${{ matrix.context }}
|
||||
context: 6.0/${{ matrix.context }}
|
||||
push: false
|
||||
load: true
|
||||
tags: docker.io/martialblog/limesurvey:5-${{ matrix.context }}
|
||||
tags: docker.io/martialblog/limesurvey:6-${{ matrix.context }}
|
||||
|
||||
- name: 'Run Structure tests'
|
||||
uses: plexsystems/container-structure-test-action@v0.2.0
|
||||
uses: plexsystems/container-structure-test-action@v0.3.0
|
||||
with:
|
||||
image: docker.io/martialblog/limesurvey:5-${{ matrix.context }}
|
||||
image: docker.io/martialblog/limesurvey:6-${{ matrix.context }}
|
||||
config: tests/${{ matrix.context }}-tests.yaml
|
||||
|
||||
19
.github/workflows/test-lts-container-images.yaml
vendored
19
.github/workflows/test-lts-container-images.yaml
vendored
@@ -4,7 +4,7 @@ on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
test_images:
|
||||
name: Test LTS Container Images with Trivy
|
||||
name: Test LTS Container Images
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
@@ -14,21 +14,24 @@ jobs:
|
||||
- fpm
|
||||
steps:
|
||||
- name: 'Check out the repo'
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: 'Set up QEMU'
|
||||
uses: docker/setup-qemu-action@v2
|
||||
|
||||
- name: 'Set up Docker Buildx'
|
||||
uses: docker/setup-buildx-action@v1
|
||||
uses: docker/setup-buildx-action@v2
|
||||
|
||||
- name: 'Build Container images'
|
||||
uses: docker/build-push-action@v2
|
||||
uses: docker/build-push-action@v4
|
||||
with:
|
||||
context: 3.0/${{ matrix.context }}
|
||||
context: 5.0/${{ matrix.context }}
|
||||
push: false
|
||||
load: true
|
||||
tags: docker.io/martialblog/limesurvey:3-${{ matrix.context }}
|
||||
tags: docker.io/martialblog/limesurvey:5-${{ matrix.context }}
|
||||
|
||||
- name: 'Run Structure tests'
|
||||
uses: plexsystems/container-structure-test-action@v0.2.0
|
||||
uses: plexsystems/container-structure-test-action@v0.3.0
|
||||
with:
|
||||
image: docker.io/martialblog/limesurvey:3-${{ matrix.context }}
|
||||
image: docker.io/martialblog/limesurvey:5-${{ matrix.context }}
|
||||
config: tests/${{ matrix.context }}-tests.yaml
|
||||
|
||||
@@ -1,9 +1,5 @@
|
||||
FROM php:8.0-apache
|
||||
FROM docker.io/php:8.0-apache
|
||||
LABEL maintainer="markus@martialblog.de"
|
||||
ARG version='3.27.31+220104'
|
||||
ARG sha256_checksum='f55cd1db1323c4bdcea9008f0025b0a5e2092942f329cf60db2f6cb387202a7f'
|
||||
ARG USER=root
|
||||
ARG LISTEN_PORT=80
|
||||
|
||||
# Install OS dependencies
|
||||
RUN set -ex; \
|
||||
@@ -50,8 +46,6 @@ RUN set -ex; \
|
||||
tidy \
|
||||
zip
|
||||
|
||||
ENV LIMESURVEY_VERSION=$version
|
||||
|
||||
# Apache configuration
|
||||
RUN a2enmod headers rewrite remoteip; \
|
||||
{\
|
||||
@@ -65,9 +59,16 @@ RUN a2enmod headers rewrite remoteip; \
|
||||
# Use the default production configuration
|
||||
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
|
||||
|
||||
# Download, unzip and chmod LimeSurvey from official GitHub repository
|
||||
ARG version="3.28.56+230404"
|
||||
ARG sha256_checksum="abfdc800d97feabbd448df4a2cfa72a954d2f6b013475132b0691ac2563e7228"
|
||||
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
|
||||
ARG USER=root
|
||||
ARG LISTEN_PORT=80
|
||||
ENV LIMESURVEY_VERSION=$version
|
||||
|
||||
# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository)
|
||||
RUN set -ex; \
|
||||
curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz && \
|
||||
curl -sSL "${archive_url}" --output /tmp/limesurvey.tar.gz && \
|
||||
echo "${sha256_checksum} /tmp/limesurvey.tar.gz" | sha256sum -c - && \
|
||||
\
|
||||
tar xzvf "/tmp/limesurvey.tar.gz" --strip-components=1 -C /var/www/html/ && \
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
FROM php:8.0-fpm-alpine
|
||||
FROM docker.io/php:8.0-fpm-alpine
|
||||
LABEL maintainer="markus@martialblog.de"
|
||||
ARG version='3.27.31+220104'
|
||||
ARG sha256_checksum='f55cd1db1323c4bdcea9008f0025b0a5e2092942f329cf60db2f6cb387202a7f'
|
||||
|
||||
# Install OS dependencies
|
||||
RUN set -ex; \
|
||||
@@ -35,9 +33,14 @@ RUN set -ex; \
|
||||
tidy \
|
||||
zip
|
||||
|
||||
# Download, unzip and chmod LimeSurvey from official GitHub repository
|
||||
ARG version="3.28.56+230404"
|
||||
ARG sha256_checksum="abfdc800d97feabbd448df4a2cfa72a954d2f6b013475132b0691ac2563e7228"
|
||||
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
|
||||
ENV LIMESURVEY_VERSION=$version
|
||||
|
||||
# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository)
|
||||
RUN set -ex; \
|
||||
curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz && \
|
||||
curl -sSL "${archive_url}" --output /tmp/limesurvey.tar.gz && \
|
||||
echo "${sha256_checksum} /tmp/limesurvey.tar.gz" | sha256sum -c - && \
|
||||
\
|
||||
tar xzvf "/tmp/limesurvey.tar.gz" --strip-components=1 -C /var/www/html/ && \
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
FROM php:8.0-fpm
|
||||
FROM docker.io/php:8.0-fpm
|
||||
LABEL maintainer="markus@martialblog.de"
|
||||
ARG version='3.27.31+220104'
|
||||
ARG sha256_checksum='f55cd1db1323c4bdcea9008f0025b0a5e2092942f329cf60db2f6cb387202a7f'
|
||||
|
||||
# Install OS dependencies
|
||||
RUN set -ex; \
|
||||
@@ -48,11 +46,14 @@ RUN set -ex; \
|
||||
tidy \
|
||||
zip
|
||||
|
||||
ARG version="3.28.56+230404"
|
||||
ARG sha256_checksum="abfdc800d97feabbd448df4a2cfa72a954d2f6b013475132b0691ac2563e7228"
|
||||
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
|
||||
ENV LIMESURVEY_VERSION=$version
|
||||
|
||||
# Download, unzip and chmod LimeSurvey from official GitHub repository
|
||||
# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository)
|
||||
RUN set -ex; \
|
||||
curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz && \
|
||||
curl -sSL "${archive_url}" --output /tmp/limesurvey.tar.gz && \
|
||||
echo "${sha256_checksum} /tmp/limesurvey.tar.gz" | sha256sum -c - && \
|
||||
\
|
||||
tar xzvf "/tmp/limesurvey.tar.gz" --strip-components=1 -C /var/www/html/ && \
|
||||
|
||||
@@ -1,9 +1,5 @@
|
||||
FROM php:8.0-apache
|
||||
FROM docker.io/php:8.0-apache
|
||||
LABEL maintainer="markus@martialblog.de"
|
||||
ARG version='5.2.9+220110'
|
||||
ARG sha256_checksum='362c99a26cd787e03b470b46270ed610f4497a820b21879d1a615ab901d9dced'
|
||||
ARG USER=www-data
|
||||
ARG LISTEN_PORT=8080
|
||||
|
||||
# Install OS dependencies
|
||||
RUN set -ex; \
|
||||
@@ -51,8 +47,6 @@ RUN set -ex; \
|
||||
tidy \
|
||||
zip
|
||||
|
||||
ENV LIMESURVEY_VERSION=$version
|
||||
|
||||
# Apache configuration
|
||||
RUN a2enmod headers rewrite remoteip; \
|
||||
{\
|
||||
@@ -66,9 +60,16 @@ RUN a2enmod headers rewrite remoteip; \
|
||||
# Use the default production configuration
|
||||
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
|
||||
|
||||
# Download, unzip and chmod LimeSurvey from official GitHub repository
|
||||
ARG version="5.6.18+230503"
|
||||
ARG sha256_checksum="45f537c251c2c0086c73f497ccdb0cb2681136d3df0fabc9762aeb54ac7bdfd3"
|
||||
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
|
||||
ARG USER=www-data
|
||||
ARG LISTEN_PORT=8080
|
||||
ENV LIMESURVEY_VERSION=$version
|
||||
|
||||
# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository)
|
||||
RUN set -ex; \
|
||||
curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz && \
|
||||
curl -sSL "${archive_url}" --output /tmp/limesurvey.tar.gz && \
|
||||
echo "${sha256_checksum} /tmp/limesurvey.tar.gz" | sha256sum -c - && \
|
||||
\
|
||||
tar xzvf "/tmp/limesurvey.tar.gz" --strip-components=1 -C /var/www/html/ && \
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
FROM php:8.0-fpm-alpine
|
||||
FROM docker.io/php:8.0-fpm-alpine
|
||||
LABEL maintainer="markus@martialblog.de"
|
||||
ARG version='5.2.9+220110'
|
||||
ARG sha256_checksum='362c99a26cd787e03b470b46270ed610f4497a820b21879d1a615ab901d9dced'
|
||||
ARG USER=www-data
|
||||
|
||||
# Install OS dependencies
|
||||
RUN set -ex; \
|
||||
@@ -37,9 +34,15 @@ RUN set -ex; \
|
||||
tidy \
|
||||
zip
|
||||
|
||||
# Download, unzip and chmod LimeSurvey from official GitHub repository
|
||||
ARG version="5.6.18+230503"
|
||||
ARG sha256_checksum="45f537c251c2c0086c73f497ccdb0cb2681136d3df0fabc9762aeb54ac7bdfd3"
|
||||
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
|
||||
ARG USER=www-data
|
||||
ENV LIMESURVEY_VERSION=$version
|
||||
|
||||
# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository)
|
||||
RUN set -ex; \
|
||||
curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz && \
|
||||
curl -sSL "${archive_url}" --output /tmp/limesurvey.tar.gz && \
|
||||
echo "${sha256_checksum} /tmp/limesurvey.tar.gz" | sha256sum -c - && \
|
||||
\
|
||||
tar xzvf "/tmp/limesurvey.tar.gz" --strip-components=1 -C /var/www/html/ && \
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
FROM php:8.0-fpm
|
||||
FROM docker.io/php:8.0-fpm
|
||||
LABEL maintainer="markus@martialblog.de"
|
||||
ARG version='5.2.9+220110'
|
||||
ARG sha256_checksum='362c99a26cd787e03b470b46270ed610f4497a820b21879d1a615ab901d9dced'
|
||||
ARG USER=www-data
|
||||
|
||||
# Install OS dependencies
|
||||
RUN set -ex; \
|
||||
@@ -49,11 +46,15 @@ RUN set -ex; \
|
||||
tidy \
|
||||
zip
|
||||
|
||||
ARG version="5.6.18+230503"
|
||||
ARG sha256_checksum="45f537c251c2c0086c73f497ccdb0cb2681136d3df0fabc9762aeb54ac7bdfd3"
|
||||
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
|
||||
ARG USER=www-data
|
||||
ENV LIMESURVEY_VERSION=$version
|
||||
|
||||
# Download, unzip and chmod LimeSurvey from official GitHub repository
|
||||
# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository)
|
||||
RUN set -ex; \
|
||||
curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz && \
|
||||
curl -sSL "${archive_url}" --output /tmp/limesurvey.tar.gz && \
|
||||
echo "${sha256_checksum} /tmp/limesurvey.tar.gz" | sha256sum -c - && \
|
||||
\
|
||||
tar xzvf "/tmp/limesurvey.tar.gz" --strip-components=1 -C /var/www/html/ && \
|
||||
|
||||
@@ -1,9 +1,5 @@
|
||||
FROM php:8.0-apache
|
||||
FROM docker.io/php:8.1-apache
|
||||
LABEL maintainer="markus@martialblog.de"
|
||||
ARG version='4.6.3+210518'
|
||||
ARG sha256_checksum='3c59afc13d0cf974c465c5f851cb8837117518e94031f5e3a28ba468ad734ce2'
|
||||
ARG USER=root
|
||||
ARG LISTEN_PORT=80
|
||||
|
||||
# Install OS dependencies
|
||||
RUN set -ex; \
|
||||
@@ -51,8 +47,6 @@ RUN set -ex; \
|
||||
tidy \
|
||||
zip
|
||||
|
||||
ENV LIMESURVEY_VERSION=$version
|
||||
|
||||
# Apache configuration
|
||||
RUN a2enmod headers rewrite remoteip; \
|
||||
{\
|
||||
@@ -66,17 +60,27 @@ RUN a2enmod headers rewrite remoteip; \
|
||||
# Use the default production configuration
|
||||
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
|
||||
|
||||
# Download, unzip and chmod LimeSurvey from official GitHub repository
|
||||
ARG version="6.0.5+230502"
|
||||
ARG sha256_checksum="a44008489cb8e859307fbde99adac2809433d68cff66e6fcc303ce23722c5798"
|
||||
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
|
||||
ARG USER=www-data
|
||||
ARG LISTEN_PORT=8080
|
||||
ENV LIMESURVEY_VERSION=$version
|
||||
|
||||
# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository)
|
||||
RUN set -ex; \
|
||||
curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz && \
|
||||
curl -sSL "${archive_url}" --output /tmp/limesurvey.tar.gz && \
|
||||
echo "${sha256_checksum} /tmp/limesurvey.tar.gz" | sha256sum -c - && \
|
||||
\
|
||||
tar xzvf "/tmp/limesurvey.tar.gz" --strip-components=1 -C /var/www/html/ && \
|
||||
rm -f "/tmp/limesurvey.tar.gz" && \
|
||||
chown -R www-data:www-data /var/www/html /etc/apache2
|
||||
chown -R "$USER:$USER" /var/www/html /etc/apache2
|
||||
|
||||
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"]
|
||||
@@ -15,6 +15,8 @@ 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'}
|
||||
@@ -24,11 +26,13 @@ ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
|
||||
BASE_URL=${BASE_URL:-}
|
||||
PUBLIC_URL=${PUBLIC_URL:-}
|
||||
URL_FORMAT=${URL_FORMAT:-'path'}
|
||||
SHOW_SCRIPT_NAME=${SHOW_SCRIPT_NAME:-'true'}
|
||||
TABLE_SESSION=${TABLE_SESSION:-}
|
||||
|
||||
DEBUG=${DEBUG:-0}
|
||||
DEBUG_SQL=${DEBUG_SQL:-0}
|
||||
|
||||
LISTEN_PORT=${LISTEN_PORT:-"80"}
|
||||
LISTEN_PORT=${LISTEN_PORT:-"8080"}
|
||||
|
||||
if [ -z "$DB_PASSWORD" ]; then
|
||||
echo >&2 'Error: Missing DB_PASSWORD'
|
||||
@@ -92,12 +96,17 @@ 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',
|
||||
// 'connectionID' => 'db',
|
||||
// 'sessionTableName' => '{{sessions}}',
|
||||
//),
|
||||
'urlManager' => array(
|
||||
'urlFormat' => '$URL_FORMAT',
|
||||
'rules' => array(),
|
||||
'showScriptName' => true,
|
||||
'showScriptName' => $SHOW_SCRIPT_NAME,
|
||||
),
|
||||
'request' => array(
|
||||
'baseUrl' => '$BASE_URL',
|
||||
@@ -115,6 +124,13 @@ EOF
|
||||
|
||||
fi
|
||||
|
||||
# Enable Table Sessions if required
|
||||
if [ -n "$TABLE_SESSION" ]; then
|
||||
echo 'Info: Setting Table Session'
|
||||
# Remove the comments in the config
|
||||
sed -i "s/\/\///g" application/config/config.php
|
||||
fi
|
||||
|
||||
# Check if security config already provisioned
|
||||
if [ -f application/config/security.php ]; then
|
||||
echo 'Info: security.php already provisioned'
|
||||
@@ -128,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
|
||||
3
6.0/apache/vhosts-access-log.conf
Normal file
3
6.0/apache/vhosts-access-log.conf
Normal file
@@ -0,0 +1,3 @@
|
||||
SetEnvIF User-Agent "(?i)(check|health|probe)" dontlog
|
||||
ErrorLog ${APACHE_LOG_DIR}/error.log
|
||||
CustomLog ${APACHE_LOG_DIR}/access.log combined env=!dontlog
|
||||
@@ -1,7 +1,5 @@
|
||||
FROM php:8.0-fpm-alpine
|
||||
FROM docker.io/php:8.1-fpm-alpine
|
||||
LABEL maintainer="markus@martialblog.de"
|
||||
ARG version='4.6.3+210518'
|
||||
ARG sha256_checksum='3c59afc13d0cf974c465c5f851cb8837117518e94031f5e3a28ba468ad734ce2'
|
||||
|
||||
# Install OS dependencies
|
||||
RUN set -ex; \
|
||||
@@ -36,9 +34,15 @@ RUN set -ex; \
|
||||
tidy \
|
||||
zip
|
||||
|
||||
# Download, unzip and chmod LimeSurvey from official GitHub repository
|
||||
ARG version="6.0.5+230502"
|
||||
ARG sha256_checksum="a44008489cb8e859307fbde99adac2809433d68cff66e6fcc303ce23722c5798"
|
||||
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
|
||||
ARG USER=www-data
|
||||
ENV LIMESURVEY_VERSION=$version
|
||||
|
||||
# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository)
|
||||
RUN set -ex; \
|
||||
curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz && \
|
||||
curl -sSL "${archive_url}" --output /tmp/limesurvey.tar.gz && \
|
||||
echo "${sha256_checksum} /tmp/limesurvey.tar.gz" | sha256sum -c - && \
|
||||
\
|
||||
tar xzvf "/tmp/limesurvey.tar.gz" --strip-components=1 -C /var/www/html/ && \
|
||||
@@ -47,12 +51,13 @@ RUN set -ex; \
|
||||
/var/www/html/docs \
|
||||
/var/www/html/tests \
|
||||
/var/www/html/*.md && \
|
||||
chown -R www-data:root /var/www/ ; \
|
||||
chown -R "${USER}:root" /var/www/ ; \
|
||||
chmod -R g=u /var/www
|
||||
|
||||
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
|
||||
USER $USER
|
||||
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
|
||||
CMD ["php-fpm"]
|
||||
@@ -15,6 +15,8 @@ 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'}
|
||||
@@ -24,6 +26,8 @@ ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
|
||||
BASE_URL=${BASE_URL:-}
|
||||
PUBLIC_URL=${PUBLIC_URL:-}
|
||||
URL_FORMAT=${URL_FORMAT:-'path'}
|
||||
SHOW_SCRIPT_NAME=${SHOW_SCRIPT_NAME:-'true'}
|
||||
TABLE_SESSION=${TABLE_SESSION:-}
|
||||
|
||||
DEBUG=${DEBUG:-0}
|
||||
DEBUG_SQL=${DEBUG_SQL:-0}
|
||||
@@ -85,12 +89,17 @@ 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',
|
||||
// 'connectionID' => 'db',
|
||||
// 'sessionTableName' => '{{sessions}}',
|
||||
//),
|
||||
'urlManager' => array(
|
||||
'urlFormat' => '$URL_FORMAT',
|
||||
'rules' => array(),
|
||||
'showScriptName' => true,
|
||||
'showScriptName' => $SHOW_SCRIPT_NAME,
|
||||
),
|
||||
'request' => array(
|
||||
'baseUrl' => '$BASE_URL',
|
||||
@@ -108,6 +117,13 @@ EOF
|
||||
|
||||
fi
|
||||
|
||||
# Enable Table Sessions if required
|
||||
if [ -n "$TABLE_SESSION" ]; then
|
||||
echo 'Info: Setting Table Session'
|
||||
# Remove the comments in the config
|
||||
sed -i "s/\/\///g" application/config/config.php
|
||||
fi
|
||||
|
||||
# Check if security config already provisioned
|
||||
if [ -f application/config/security.php ]; then
|
||||
echo 'Info: security.php already provisioned'
|
||||
@@ -121,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,5 @@
|
||||
FROM php:8.0-fpm
|
||||
FROM docker.io/php:8.1-fpm
|
||||
LABEL maintainer="markus@martialblog.de"
|
||||
ARG version='4.6.3+210518'
|
||||
ARG sha256_checksum='3c59afc13d0cf974c465c5f851cb8837117518e94031f5e3a28ba468ad734ce2'
|
||||
|
||||
# Install OS dependencies
|
||||
RUN set -ex; \
|
||||
@@ -48,20 +46,25 @@ RUN set -ex; \
|
||||
tidy \
|
||||
zip
|
||||
|
||||
ARG version="6.0.5+230502"
|
||||
ARG sha256_checksum="a44008489cb8e859307fbde99adac2809433d68cff66e6fcc303ce23722c5798"
|
||||
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
|
||||
ARG USER=www-data
|
||||
ENV LIMESURVEY_VERSION=$version
|
||||
|
||||
# Download, unzip and chmod LimeSurvey from official GitHub repository
|
||||
# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository)
|
||||
RUN set -ex; \
|
||||
curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz && \
|
||||
curl -sSL "${archive_url}" --output /tmp/limesurvey.tar.gz && \
|
||||
echo "${sha256_checksum} /tmp/limesurvey.tar.gz" | sha256sum -c - && \
|
||||
\
|
||||
tar xzvf "/tmp/limesurvey.tar.gz" --strip-components=1 -C /var/www/html/ && \
|
||||
rm -f "/tmp/limesurvey.tar.gz" && \
|
||||
chown -R www-data:www-data /var/www/html
|
||||
chown -R "$USER:$USER" /var/www/html
|
||||
|
||||
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
|
||||
USER $USER
|
||||
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
|
||||
CMD ["php-fpm"]
|
||||
@@ -15,6 +15,8 @@ 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'}
|
||||
@@ -24,6 +26,8 @@ ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
|
||||
BASE_URL=${BASE_URL:-}
|
||||
PUBLIC_URL=${PUBLIC_URL:-}
|
||||
URL_FORMAT=${URL_FORMAT:-'path'}
|
||||
SHOW_SCRIPT_NAME=${SHOW_SCRIPT_NAME:-'true'}
|
||||
TABLE_SESSION=${TABLE_SESSION:-}
|
||||
|
||||
DEBUG=${DEBUG:-0}
|
||||
DEBUG_SQL=${DEBUG_SQL:-0}
|
||||
@@ -85,12 +89,17 @@ 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',
|
||||
// 'connectionID' => 'db',
|
||||
// 'sessionTableName' => '{{sessions}}',
|
||||
//),
|
||||
'urlManager' => array(
|
||||
'urlFormat' => '$URL_FORMAT',
|
||||
'rules' => array(),
|
||||
'showScriptName' => true,
|
||||
'showScriptName' => $SHOW_SCRIPT_NAME,
|
||||
),
|
||||
'request' => array(
|
||||
'baseUrl' => '$BASE_URL',
|
||||
@@ -108,6 +117,13 @@ EOF
|
||||
|
||||
fi
|
||||
|
||||
# Enable Table Sessions if required
|
||||
if [ -n "$TABLE_SESSION" ]; then
|
||||
echo 'Info: Setting Table Session'
|
||||
# Remove the comments in the config
|
||||
sed -i "s/\/\///g" application/config/config.php
|
||||
fi
|
||||
|
||||
# Check if security config already provisioned
|
||||
if [ -f application/config/security.php ]; then
|
||||
echo 'Info: security.php already provisioned'
|
||||
@@ -121,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
|
||||
@@ -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)
|
||||
@@ -12,19 +21,19 @@ To update the version, simply update ARG variables for version and corresponding
|
||||
# Version from GitHub Tags
|
||||
# sha256 of tar.gz from GitHub Releases
|
||||
|
||||
$ grep ARG 4.0/apache/Dockerfile
|
||||
ARG version='4.3.13+200824'
|
||||
$ grep ARG 5.0/apache/Dockerfile
|
||||
ARG version='5.3.13+200824'
|
||||
ARG sha256_checksum='4e9c6f20e'
|
||||
```
|
||||
|
||||
It is best to use the upgrade shell script:
|
||||
|
||||
```bash
|
||||
./upgrade.sh 4.3.13+200824
|
||||
./upgrade.sh 5.3.13+200824
|
||||
# Check if sha256 is correct
|
||||
|
||||
git add 4.0/ && git commit -m 'Upgrading to Version 4.3.13+200824'
|
||||
git tag 4.3.13-200824
|
||||
git add 5.0/ && git commit -m 'Upgrading to Version 5.3.13+200824'
|
||||
git tag 5.3.13-200824
|
||||
```
|
||||
|
||||
## Testing
|
||||
@@ -50,3 +59,9 @@ make fpm-alpine-latest
|
||||
|
||||
container-structure-test test --image docker.io/martialblog/limesurvey:5-fpm --config tests/fpm-tests.yaml
|
||||
```
|
||||
|
||||
### ARM Platform
|
||||
|
||||
Changes related to the ARM platform should use branches starting with the `arm/` prefix, this ensures the GitHub Actions are triggered.
|
||||
|
||||
Background: ARM builds take a long time to finish on the GitHub Runners.
|
||||
|
||||
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:5-apache 5.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:6-apache 6.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:5-fpm-alpine 5.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:6-fpm-alpine 6.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:5-fpm 5.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:6-fpm 6.0/fpm
|
||||
|
||||
35
README.md
35
README.md
@@ -14,12 +14,12 @@ Dockerfile to build a [LimeSurvey](https://limesurvey.org) Image for the Docker
|
||||
|
||||
## Supported tags and respective Dockerfile links
|
||||
|
||||
- [`6-apache`, `6.<BUILD-NUMBER>-apache`, `latest` ](https://github.com/martialblog/docker-limesurvey/blob/master/6.0/apache/Dockerfile)
|
||||
- [`6-fpm`, `6.<BUILD-NUMBER>-fpm`](https://github.com/martialblog/docker-limesurvey/blob/master/6.0/fpm/Dockerfile)
|
||||
- [`6-fpm-alpine`, `6.<BUILD-NUMBER>-fpm-alpine`](https://github.com/martialblog/docker-limesurvey/blob/master/6.0/fpm-alpine/Dockerfile)
|
||||
- [`5-apache`, `5.<BUILD-NUMBER>-apache`, `latest` ](https://github.com/martialblog/docker-limesurvey/blob/master/5.0/apache/Dockerfile)
|
||||
- [`5-fpm`, `5.<BUILD-NUMBER>-fpm`](https://github.com/martialblog/docker-limesurvey/blob/master/5.0/fpm/Dockerfile)
|
||||
- [`5-fpm-alpine`, `5.<BUILD-NUMBER>-fpm-alpine`](https://github.com/martialblog/docker-limesurvey/blob/master/5.0/fpm-alpine/Dockerfile)
|
||||
- [`3-apache`, `3.<BUILD-NUMBER>-apache`](https://github.com/martialblog/docker-limesurvey/blob/master/3.0/apache/Dockerfile)
|
||||
- [`3-fpm`, `3.<BUILD-NUMBER>-fpm`](https://github.com/martialblog/docker-limesurvey/blob/master/3.0/fpm/Dockerfile)
|
||||
- [`3-fpm-alpine`, `3.<BUILD-NUMBER>-fpm-alpine`](https://github.com/martialblog/docker-limesurvey/blob/master/3.0/fpm-alpine/Dockerfile)
|
||||
|
||||
# Using the Apache Image
|
||||
|
||||
@@ -85,6 +85,12 @@ For further details on the settings see: https://manual.limesurvey.org/Data_encr
|
||||
|
||||
# Reverse Proxy configuration
|
||||
|
||||
If you are running LimeSurvey behind a Reverse Proxy you might need some additional configuration in the Proxy. For example:
|
||||
|
||||
* Apache: `ProxyPreserveHost On`
|
||||
* Nginx: `fastcgi_param HTTP_HOST my-survey.example.local;`
|
||||
* Traefik: Set the Host Header explicitly via a customRequestHeaders
|
||||
|
||||
## 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.
|
||||
@@ -117,14 +123,14 @@ 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 |
|
||||
| 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) |
|
||||
| ENCRYPT_NONCE | Data encryption nonce (used in 5.0 and higher) |
|
||||
| ENCRYPT_SECRET_BOX_KEY | Data encryption secret box key (used in 5.0 and higher) |
|
||||
| LISTEN_PORT | Apache: Listen port. Default: 8080 |
|
||||
|
||||
For further details on the settings see: https://manual.limesurvey.org/Optional_settings#Advanced_Path_Settings
|
||||
@@ -165,6 +171,12 @@ local docker-limesurvey_lime
|
||||
$ docker volume rm docker-limesurvey_lime
|
||||
```
|
||||
|
||||
## Upgrading to 6.0 from 5.x
|
||||
|
||||
The LimeSurvey 6 Images will use PHP 8.1 as Base Images.
|
||||
|
||||
LimeSurvey 5 will become the new LTS. LimeSurvey 3 is deprecated and will no longer be supported.
|
||||
|
||||
## Upgrading to 5.0 from 4.x
|
||||
|
||||
The default user in the Container will now be *www-data* (uid 33 in Debian, uid 82 in Alpine), any volumes mounted need the corresponding permissions:
|
||||
@@ -185,6 +197,17 @@ 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.
|
||||
|
||||
This might be fixed by setting the HTTP Host Header in the reverse proxy explicitly.
|
||||
|
||||
See:
|
||||
- https://github.com/martialblog/docker-limesurvey/issues/127
|
||||
|
||||
# References
|
||||
|
||||
- https://www.limesurvey.org/
|
||||
|
||||
29
docker-compose.apache.yml
Normal file
29
docker-compose.apache.yml
Normal file
@@ -0,0 +1,29 @@
|
||||
version: "3.0"
|
||||
services:
|
||||
limesurvey:
|
||||
image: docker.io/martialblog/limesurvey:latest
|
||||
links:
|
||||
- lime-db
|
||||
depends_on:
|
||||
- lime-db
|
||||
environment:
|
||||
- "DB_HOST=lime-db"
|
||||
- "DB_PASSWORD=secret"
|
||||
- "ADMIN_PASSWORD=foobar"
|
||||
- "PUBLIC_URL=http://my.survey.localhost:8080" # Example, Change this
|
||||
- "BASE_URL=http://my.survey.localhost:8080" # Example, Change this
|
||||
proxy:
|
||||
image: docker.io/httpd:bullseye
|
||||
volumes:
|
||||
- "./examples/apache-httpd.conf:/usr/local/apache2/conf/httpd.conf:ro"
|
||||
- "./examples/apache-reverse-proxy.conf:/usr/local/apache2/conf/reverse-proxy.conf:ro"
|
||||
ports:
|
||||
- "8080:8080"
|
||||
lime-db:
|
||||
image: docker.io/mysql:5.7
|
||||
environment:
|
||||
- "MYSQL_USER=limesurvey"
|
||||
- "MYSQL_DATABASE=limesurvey"
|
||||
- "MYSQL_PASSWORD=secret"
|
||||
- "MYSQL_ROOT_PASSWORD=secret"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -2,7 +2,7 @@ version: "3.0"
|
||||
services:
|
||||
limesurvey:
|
||||
build:
|
||||
context: 5.0/fpm/
|
||||
context: 6.0/fpm/
|
||||
dockerfile: Dockerfile
|
||||
volumes:
|
||||
# Hint: This is just an example, change /tmp to something persistent
|
||||
@@ -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"
|
||||
|
||||
@@ -2,7 +2,7 @@ version: "3.0"
|
||||
services:
|
||||
limesurvey:
|
||||
build:
|
||||
context: 5.0/fpm-alpine/
|
||||
context: 6.0/fpm-alpine/
|
||||
dockerfile: Dockerfile
|
||||
volumes:
|
||||
# Hint: This is just an example, change /tmp to something persistent
|
||||
@@ -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"
|
||||
|
||||
@@ -2,7 +2,7 @@ version: "3.0"
|
||||
services:
|
||||
limesurvey:
|
||||
build:
|
||||
context: 5.0/fpm/
|
||||
context: 6.0/fpm/
|
||||
dockerfile: Dockerfile
|
||||
volumes:
|
||||
# Hint: This is just an example, change /tmp to something persistent
|
||||
@@ -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"
|
||||
|
||||
@@ -3,7 +3,7 @@ services:
|
||||
limesurvey:
|
||||
build:
|
||||
# Hint: Change it to 3.0/apache/ if you want to use LimeSurvey 3.*
|
||||
context: 5.0/apache/
|
||||
context: 6.0/apache/
|
||||
dockerfile: Dockerfile
|
||||
volumes:
|
||||
# Hint: This is just an example, change /tmp to something persistent
|
||||
@@ -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:
|
||||
|
||||
42
docker-compose.traefik.domain.yml
Normal file
42
docker-compose.traefik.domain.yml
Normal file
@@ -0,0 +1,42 @@
|
||||
version: "3.0"
|
||||
services:
|
||||
limesurvey:
|
||||
build:
|
||||
context: 6.0/apache/
|
||||
dockerfile: Dockerfile
|
||||
labels:
|
||||
traefik.enable: 'true'
|
||||
traefik.http.routers.limesurvey-http-router.entrypoints: "http"
|
||||
traefik.http.routers.limesurvey-http-router.rule: "Host(`my.survey.localhost`)"
|
||||
traefik.http.services.limesurvey-service.loadbalancer.server.port: "8080"
|
||||
links:
|
||||
- lime-db
|
||||
depends_on:
|
||||
- lime-db
|
||||
environment:
|
||||
- "DB_HOST=lime-db"
|
||||
- "DB_PASSWORD=secret"
|
||||
- "ADMIN_PASSWORD=foobar"
|
||||
- "PUBLIC_URL=http://my.survey.localhost:8888"
|
||||
- "BASE_URL=http://my.survey.localhost:8888"
|
||||
traefik:
|
||||
image: docker.io/traefik:v2.9
|
||||
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: docker.io/mysql:5.7
|
||||
environment:
|
||||
- "MYSQL_USER=limesurvey"
|
||||
- "MYSQL_DATABASE=limesurvey"
|
||||
- "MYSQL_PASSWORD=secret"
|
||||
- "MYSQL_ROOT_PASSWORD=secret"
|
||||
|
||||
@@ -2,7 +2,7 @@ version: "3.0"
|
||||
services:
|
||||
limesurvey:
|
||||
build:
|
||||
context: 5.0/apache/
|
||||
context: 6.0/apache/
|
||||
dockerfile: Dockerfile
|
||||
labels:
|
||||
traefik.enable: 'true'
|
||||
@@ -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.9
|
||||
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"
|
||||
|
||||
@@ -2,7 +2,7 @@ version: "3.0"
|
||||
services:
|
||||
limesurvey:
|
||||
build:
|
||||
context: 5.0/apache/
|
||||
context: 6.0/apache/
|
||||
dockerfile: Dockerfile
|
||||
volumes:
|
||||
# Hint: This is just an example, change /tmp to something persistent
|
||||
@@ -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"
|
||||
|
||||
131
examples/apache-httpd.conf
Normal file
131
examples/apache-httpd.conf
Normal file
@@ -0,0 +1,131 @@
|
||||
ServerRoot "/usr/local/apache2"
|
||||
Listen 8080
|
||||
|
||||
LoadModule mpm_event_module modules/mod_mpm_event.so
|
||||
LoadModule authn_file_module modules/mod_authn_file.so
|
||||
LoadModule authn_core_module modules/mod_authn_core.so
|
||||
LoadModule authz_host_module modules/mod_authz_host.so
|
||||
LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
|
||||
LoadModule authz_user_module modules/mod_authz_user.so
|
||||
LoadModule authz_core_module modules/mod_authz_core.so
|
||||
LoadModule access_compat_module modules/mod_access_compat.so
|
||||
LoadModule auth_basic_module modules/mod_auth_basic.so
|
||||
LoadModule watchdog_module modules/mod_watchdog.so
|
||||
LoadModule reqtimeout_module modules/mod_reqtimeout.so
|
||||
LoadModule filter_module modules/mod_filter.so
|
||||
LoadModule mime_module modules/mod_mime.so
|
||||
LoadModule log_config_module modules/mod_log_config.so
|
||||
LoadModule env_module modules/mod_env.so
|
||||
LoadModule headers_module modules/mod_headers.so
|
||||
LoadModule setenvif_module modules/mod_setenvif.so
|
||||
LoadModule version_module modules/mod_version.so
|
||||
LoadModule proxy_module modules/mod_proxy.so
|
||||
LoadModule proxy_connect_module modules/mod_proxy_connect.so
|
||||
LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
|
||||
LoadModule proxy_http_module modules/mod_proxy_http.so
|
||||
LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so
|
||||
LoadModule proxy_scgi_module modules/mod_proxy_scgi.so
|
||||
LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so
|
||||
LoadModule proxy_fdpass_module modules/mod_proxy_fdpass.so
|
||||
LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so
|
||||
LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
|
||||
LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
|
||||
LoadModule proxy_express_module modules/mod_proxy_express.so
|
||||
LoadModule proxy_hcheck_module modules/mod_proxy_hcheck.so
|
||||
LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
|
||||
LoadModule ssl_module modules/mod_ssl.so
|
||||
LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so
|
||||
LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so
|
||||
LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so
|
||||
LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so
|
||||
LoadModule unixd_module modules/mod_unixd.so
|
||||
LoadModule status_module modules/mod_status.so
|
||||
LoadModule autoindex_module modules/mod_autoindex.so
|
||||
#LoadModule suexec_module modules/mod_suexec.so
|
||||
<IfModule !mpm_prefork_module>
|
||||
</IfModule>
|
||||
<IfModule mpm_prefork_module>
|
||||
</IfModule>
|
||||
LoadModule dir_module modules/mod_dir.so
|
||||
LoadModule alias_module modules/mod_alias.so
|
||||
<IfModule unixd_module>
|
||||
|
||||
User daemon
|
||||
Group daemon
|
||||
|
||||
</IfModule>
|
||||
|
||||
ServerAdmin you@example.com
|
||||
#
|
||||
<Directory />
|
||||
AllowOverride none
|
||||
Require all denied
|
||||
</Directory>
|
||||
|
||||
DocumentRoot "/usr/local/apache2/htdocs"
|
||||
<Directory "/usr/local/apache2/htdocs">
|
||||
Options Indexes FollowSymLinks
|
||||
AllowOverride None
|
||||
Require all granted
|
||||
</Directory>
|
||||
|
||||
<IfModule dir_module>
|
||||
DirectoryIndex index.html
|
||||
</IfModule>
|
||||
|
||||
<Files ".ht*">
|
||||
Require all denied
|
||||
</Files>
|
||||
|
||||
ErrorLog /proc/self/fd/2
|
||||
|
||||
LogLevel warn
|
||||
|
||||
<IfModule log_config_module>
|
||||
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
|
||||
LogFormat "%h %l %u %t \"%r\" %>s %b" common
|
||||
|
||||
<IfModule logio_module>
|
||||
# You need to enable mod_logio.c to use %I and %O
|
||||
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
|
||||
</IfModule>
|
||||
|
||||
CustomLog /proc/self/fd/1 common
|
||||
</IfModule>
|
||||
|
||||
<IfModule alias_module>
|
||||
ScriptAlias /cgi-bin/ "/usr/local/apache2/cgi-bin/"
|
||||
|
||||
</IfModule>
|
||||
|
||||
<IfModule cgid_module>
|
||||
</IfModule>
|
||||
|
||||
<Directory "/usr/local/apache2/cgi-bin">
|
||||
AllowOverride None
|
||||
Options None
|
||||
Require all granted
|
||||
</Directory>
|
||||
|
||||
<IfModule headers_module>
|
||||
RequestHeader unset Proxy early
|
||||
</IfModule>
|
||||
|
||||
<IfModule mime_module>
|
||||
TypesConfig conf/mime.types
|
||||
|
||||
AddType application/x-compress .Z
|
||||
AddType application/x-gzip .gz .tgz
|
||||
</IfModule>
|
||||
|
||||
# Configure mod_proxy_html to understand HTML4/XHTML1
|
||||
<IfModule proxy_html_module>
|
||||
Include conf/extra/proxy-html.conf
|
||||
</IfModule>
|
||||
|
||||
<IfModule ssl_module>
|
||||
SSLRandomSeed startup builtin
|
||||
SSLRandomSeed connect builtin
|
||||
</IfModule>
|
||||
|
||||
IncludeOptional conf/reverse-proxy.conf
|
||||
8
examples/apache-reverse-proxy.conf
Normal file
8
examples/apache-reverse-proxy.conf
Normal file
@@ -0,0 +1,8 @@
|
||||
<VirtualHost *:8080>
|
||||
ServerAdmin admin@localhost.local
|
||||
ServerName my.survey.localhost
|
||||
|
||||
ProxyPass / http://limesurvey:80/
|
||||
ProxyPassReverse / http://limesurvey:80/
|
||||
ProxyPreserveHost On
|
||||
</VirtualHost>
|
||||
@@ -33,6 +33,8 @@ http {
|
||||
fastcgi_pass limesurvey:9000;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||
fastcgi_param SCRIPT_NAME $fastcgi_script_name;
|
||||
# For Subdomains like https://survey.example.com
|
||||
# fastcgi_param HTTP_HOST survey.example.com;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,9 +21,6 @@ fileExistenceTests:
|
||||
path: '/var/www/html/admin/index.php'
|
||||
shouldExist: true
|
||||
permissions: '-rw-rw-r--'
|
||||
- name: 'Ldap syslink'
|
||||
path: '/usr/lib/x86_64-linux-gnu/libldap.so'
|
||||
shouldExist: true
|
||||
- name: "Dependencies - PHP - gd"
|
||||
path: '/usr/local/etc/php/conf.d/docker-php-ext-gd.ini'
|
||||
shouldExist: true
|
||||
|
||||
@@ -34,5 +34,5 @@ sed -r -i -e "s/[0-9]+(\.[0-9]+)+\+[0-9]+/$NEW_VERSION/" "$MAJOR_VERSION/apache/
|
||||
sed -r -i -e "s/[A-Fa-f0-9]{64}/$SHA256_CHECKSUM/" "$MAJOR_VERSION/apache/Dockerfile" "$MAJOR_VERSION/fpm/Dockerfile" "$MAJOR_VERSION/fpm-alpine/Dockerfile"
|
||||
|
||||
# After that, check and commit
|
||||
echo "git add 3.0 ; git commit -m 'Upgrading to LTS Version ${NEW_VERSION}' && git tag ${NEW_TAG}"
|
||||
echo "git add 5.0 ; git commit -m 'Upgrading to Version ${NEW_VERSION}' && git tag ${NEW_TAG}"
|
||||
echo "git add 5.0 ; git commit -m 'Upgrading to LTS Version ${NEW_VERSION}' && git tag ${NEW_TAG}"
|
||||
echo "git add 6.0 ; git commit -m 'Upgrading to Version ${NEW_VERSION}' && git tag ${NEW_TAG}"
|
||||
|
||||
Reference in New Issue
Block a user