Release 3.9.4 - See CHANGELOG.md

.dockerignore

@@ -0,0 +1 @@
+examples/

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/main.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Prepare
         id: prep
@@ -63,17 +63,17 @@ jobs:
           echo ::set-output name=docker_image::${DOCKER_IMAGE}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
         with:
           platforms: all
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Login 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_PASSWORD }}
@@ -102,7 +102,7 @@ jobs:
           fi
 
       - name: Build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .

.github/workflows/manual.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Prepare
         id: prep
@@ -63,17 +63,17 @@ jobs:
           echo ::set-output name=docker_image::${DOCKER_IMAGE}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
         with:
           platforms: all
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Login 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_PASSWORD }}
@@ -102,7 +102,7 @@ jobs:
           fi
 
       - name: Build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 3.9.4 2022-06-23 <dave at tiredofit dot ca>
+
+   ### Added
+      - Support tiredofit/nginx:6.0.0 and tiredofit/nginx-php-fpm:7.0.0 changes
+
+
 ## 3.9.3 2022-02-10 <dave at tiredofit dot ca>
 
    ### Changed

Dockerfile

@@ -14,7 +14,10 @@ ENV CRON_PERIOD=60 \
     PHP_ENABLE_SIMPLEXML=TRUE \
     PHP_ENABLE_XML=TRUE \
     PHP_ENABLE_XMLREADER=TRUE \
-    PHP_ENABLE_CREATE_SAMPLE_PHP=FALSE
+    PHP_ENABLE_CREATE_SAMPLE_PHP=FALSE \
+    NGINX_SITE_ENABLED=matomo
+    IMAGE_NAME="tiredofit/matomo" \
+    IMAGE_REPO_URL="https://github.com/tiredofit/docker-matomo"
 
 RUN set -x && \
     apk update && \

install/etc/nginx/conf.d/default.conf → install/etc/nginx/sites.available/matomo.conf

@@ -5,7 +5,7 @@
     index index.php;
 
     location ~ ^/(index|matomo|piwik|js/index|plugins/HeatmapSessionRecording/configs)\.php$ {
-        include /etc/nginx/nginx.conf.d/php-fpm.conf;
+        include /etc/nginx/snippets/php-fpm.conf;
 
         fastcgi_split_path_info ^(.+?\.php)(/.*)$;
         if (!-f $document_root$fastcgi_script_name) {
@@ -65,6 +65,6 @@
     }
 
     ### Don't edit past here
-    include /etc/nginx/nginx.conf.d/site_optimization.conf;
-    include /etc/nginx/nginx.conf.d/exploit_protection.conf;
+    include /etc/nginx/snippets/site_optimization.conf;
+    include /etc/nginx/snippets/exploit_protection.conf;
 }