chore(deps): bump docker/build-push-action from 5 to 6 (#57)

* chore(deps): bump docker/build-push-action from 5 to 6

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5 to 6.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v5...v6)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix(deps): bump ldapprovider from 39 to 41

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Gareth Flowers <garethflowers@users.noreply.github.com>

.github/FUNDING.yml

@@ -1 +1 @@
-ko_fi: garethflowers
+custom: "https://paypal.me/garethflowers"

.github/dependabot.yml

@@ -0,0 +1,17 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    reviewers:
+      - "garethflowers"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "docker"
+    commit-message:
+      include: "scope"
+      prefix: "chore"
+    directory: "/"
+    reviewers:
+      - "garethflowers"
+    schedule:
+      interval: "daily"

.github/workflows/publish-docker-images.yml

@@ -1,30 +0,0 @@
-name: Publish Docker Images
-on:
-  push:
-    branches: [ master ]
-  release:
-    types: [ published ]
-jobs:
-  push_to_registries:
-    name: Push Docker images
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v2
-      - name: Push to Docker Hub
-        uses: docker/build-push-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: garethflowers/mediawiki-ldap
-          add_git_labels: true
-          tag_with_ref: true
-      - name: Push to GitHub Packages
-        uses: docker/build-push-action@v1
-        with:
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          registry: docker.pkg.github.com
-          repository: ${{ github.repository }}/mediawiki-ldap
-          add_git_labels: true
-          tag_with_ref: true

.github/workflows/publish.yml

@@ -0,0 +1,61 @@
+name: Build and Publish Images
+on:
+  pull_request:
+    branches:
+      - main
+  push:
+    branches:
+      - main
+    tags:
+      - "*.*.*"
+jobs:
+  publish:
+    name: Publish
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Prepare
+        id: prep
+        uses: docker/metadata-action@v5.5.1
+        with:
+          images: |
+            ${{ github.repository_owner }}/mediawiki-ldap
+            ghcr.io/${{ github.repository_owner }}/mediawiki-ldap
+          tags: |
+            type=edge,branch=main
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to DockerHub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Login to GHCR
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and Push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm/v7,linux/ppc64le # linux/386,linux/arm/v6,linux/arm64,linux/s390x
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.prep.outputs.tags }}
+          labels: ${{ steps.prep.outputs.labels }}
+      - name: Update Description
+        continue-on-error: true
+        uses: peter-evans/dockerhub-description@v4
+        with:
+          short-description: ${{ github.event.repository.description }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}

.gitignore

@@ -0,0 +1 @@
+.DS_Store

Dockerfile

@@ -1,19 +1,8 @@
-FROM mediawiki:1.33.1
-
-ARG BUILD_DATE
-ARG VERSION
-ARG VCS_REF
-
-LABEL org.opencontainers.image.authors="Gareth Flowers" \
-	org.opencontainers.image.description="MediaWiki with LDAP Extensions" \
-	org.opencontainers.image.licenses="MIT" \
-	org.opencontainers.image.title="mediawiki-ldap" \
-	org.opencontainers.image.url="https://github.com/garethflowers/docker-mediawiki-ldap" \
-	org.opencontainers.image.vendor="garethflowers"
+FROM mediawiki:1.41.0
 
 RUN apt-get update \
 	&& apt-get install --yes --no-install-recommends libldap2-dev libpq-dev \
 	&& docker-php-ext-install ldap pgsql pdo pdo_pgsql \
 	&& rm -rf /var/lib/apt/lists \
-	&& curl https://extdist.wmflabs.org/dist/extensions/LDAPProvider-REL1_31-8e93a3e.tar.gz --output /tmp/ldapprovider.tar.gz \
+	&& curl https://extdist.wmflabs.org/dist/extensions/LDAPGroups-REL1_41-bfcb641.tar.gz --output /tmp/ldapprovider.tar.gz \
 	&& tar --extract --file=/tmp/ldapprovider.tar.gz --directory=/var/www/html/extensions

_config.yml

@@ -0,0 +1,10 @@
+docker_repository: garethflowers/mediawiki-ldap
+author: garethflowers
+plugins:
+  - jekyll-remote-theme
+  - jekyll-sitemap
+remote_theme: garethflowers/garethflowers.github.io
+tagline: Gareth Flowers
+twitter:
+  username: garethflowers
+  card: summary

test/docker-compose.yml

@@ -0,0 +1,8 @@
+services:
+  mediawiki-ldap:
+    build: .
+    command: php -v
+    image: garethflowers/mediawiki-ldap
+networks:
+  default:
+    driver: bridge

test/test.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+set -ex
+export IMAGE_NAME=garethflowers/mediawiki-ldap
+
+docker build --progress plain --tag $IMAGE_NAME .
+docker run --rm $IMAGE_NAME php -v
+
+echo "\nOK"