Upgrading to LTS Version 3.27.26+211123

Merge pull request #107 from martialblog/jack-fix-tags
Fix image tag generation
2025-12-06 16:39:11 +01:00 · 2021-11-29 12:28:41 +01:00 · 2021-11-28 14:57:38 +01:00 · 2021-11-28 11:06:23 +01:00 · 2021-11-25 07:56:11 +01:00 · 2021-11-25 07:55:47 +01:00
12 changed files with 49 additions and 33 deletions
--- a/.github/workflows/build-latest-container-images.yaml
+++ b/.github/workflows/build-latest-container-images.yaml
@@ -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:
--- a/.github/workflows/build-lts-container-images.yaml
+++ b/.github/workflows/build-lts-container-images.yaml
@@ -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:
--- a/3.0/apache/Dockerfile
+++ b/3.0/apache/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:7.4-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.27.25+211116'
-ARG sha256_checksum='91ecfecffc3a437dbb14dec19054d64f07849fe1de00a1322699bd1f50185582'
+ARG version='3.27.26+211123'
+ARG sha256_checksum='fc1176d71efc7fa4c10415ebfff5d0c78c73b1458bc30822443c4c17928a97d1'
 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"]
--- a/3.0/fpm-alpine/Dockerfile
+++ b/3.0/fpm-alpine/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:7.4-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.27.25+211116'
-ARG sha256_checksum='91ecfecffc3a437dbb14dec19054d64f07849fe1de00a1322699bd1f50185582'
+ARG version='3.27.26+211123'
+ARG sha256_checksum='fc1176d71efc7fa4c10415ebfff5d0c78c73b1458bc30822443c4c17928a97d1'

 # 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"]
--- a/3.0/fpm/Dockerfile
+++ b/3.0/fpm/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:7.4-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.27.25+211116'
-ARG sha256_checksum='91ecfecffc3a437dbb14dec19054d64f07849fe1de00a1322699bd1f50185582'
+ARG version='3.27.26+211123'
+ARG sha256_checksum='fc1176d71efc7fa4c10415ebfff5d0c78c73b1458bc30822443c4c17928a97d1'

 # 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"]
--- a/5.0/apache/Dockerfile
+++ b/5.0/apache/Dockerfile
@@ -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"]
--- a/5.0/fpm-alpine/Dockerfile
+++ b/5.0/fpm-alpine/Dockerfile
@@ -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"]
--- a/5.0/fpm/Dockerfile
+++ b/5.0/fpm/Dockerfile
@@ -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"]
--- a/docker-compose.fpm.alpine.yml
+++ b/docker-compose.fpm.alpine.yml
@@ -20,6 +20,8 @@ services:
    image: nginx:alpine
    links:
      - limesurvey
+    depends_on:
+      - limesurvey
    ports:
      - "8080:80"
    volumes:
--- a/examples/nginx.conf
+++ b/examples/nginx.conf
@@ -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)$ {
--- a/tests/apache-tests.yaml
+++ b/tests/apache-tests.yaml
@@ -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:
--- a/tests/fpm-alpine-tests.yaml
+++ b/tests/fpm-alpine-tests.yaml
@@ -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:
Author	SHA1	Message	Date
Markus Opolka	453cb4b1eb	Upgrading to LTS Version 3.27.26+211123	2021-11-29 12:28:41 +01:00
Jack Henschel	58ad34b0bd	Merge pull request #107 from martialblog/jack-fix-tags Fix image tag generation	2021-11-28 14:57:38 +01:00
Jack Henschel	8f1b452789	Fix image tag generation Previously, only the immutable tags would get generated (i.e. `5.1.2-1234`), but not the rolling tags (`5-apache`), due to a limitation of the docker metadata action. Thus, now we use manual regex matching instead. See the linked issue for details. Fixes https://github.com/martialblog/docker-limesurvey/issues/105	2021-11-28 11:06:23 +01:00
Markus Opolka	19a387488a	Move entrypoint to /usr/local/bin (#104 ) * Move entrypoint to /usr/local/bin - so that it's not served by the webserver	2021-11-25 07:56:11 +01:00
Markus Opolka	19a1a0d044	Extend example nginx.conf to include more protected paths (#103 )	2021-11-25 07:55:47 +01:00
Mark	624a17b9fc	Add depends_on for nginx so it waits until the limesurvey app is ready (#102 ) By adding a depends_on in lime-web, it will wait for the limesurvey app to be ready to accept connections.	2021-11-24 09:30:51 +01:00