v7.1.6 (#200)

bfren · web-flow · commit 5aea3869e033 · 2025-05-23T15:54:29.000+01:00
Minor updates
* Using latest base images
* Updating to MariaDB 10.11.13 and 11.4.7
* Removing 11.2 (EOL)
* Adding SSIMN.org as alternative mirror

Build updates
* Using GitHub CLI for auto PR
diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml
@@ -8,14 +8,11 @@ jobs:
     if: github.ref_type == 'branch'
     runs-on: ubuntu-latest
     steps:
-    -
-      name: Checkout Branch ${{ github.ref_name }}
-      uses: actions/checkout@v4
-    -
-      name: Create Pull Request
-      uses: bfren/pull-request@v2
-      with:
-        github_token: ${{ secrets.PAT }}
-        destination_branch: main
-        pr_title: ${{ github.ref_name }}
-        pr_body: "Merging branch to create ${{ github.ref_name }}."
+      -
+        name: Checkout Branch ${{ github.ref_name }}
+        uses: actions/checkout@v4
+      -
+        name: Create Pull Request
+        run: gh pr create -B main --title "${{ github.ref_name }}" --body "Merging branch to create ${{ github.ref_name }}."
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        mariadb: [ "10.11", "11.2", "11.4", "11.7", "11.8" ]
+        mariadb: [ "10.11", "11.4", "11.7", "11.8" ]
     runs-on: ubuntu-latest
     steps:
       -
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        mariadb: [ "10.11", "11.2", "11.4", "11.7", "11.8" ]
+        mariadb: [ "10.11", "11.4", "11.7", "11.8" ]
     runs-on: ubuntu-latest
     steps:
       -
diff --git a/10.11/Dockerfile b/10.11/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/debian-s6:bookworm-3.0.3
+FROM ghcr.io/bfren/debian-s6:bookworm-3.0.4
 
 ARG BF_IMAGE
 ARG BF_PUBLISHING
diff --git a/10.11/overlay/etc/apt/sources.list.d/mariadb.sources b/10.11/overlay/etc/apt/sources.list.d/mariadb.sources
@@ -2,7 +2,7 @@
 # https://mariadb.org/download/
 X-Repolib-Name: MariaDB
 Types: deb
-URIs: https://mirror.mariadb.org/repo/10.11.12/debian
+URIs: https://mirror.mariadb.org/repo/10.11.13/debian https://mariadb.gb.ssimn.org/repo/10.11.13/debian
 Suites: bookworm
 Components: main
 Signed-By: /etc/apt/keyrings/mariadb-keyring.pgp
diff --git a/10.11/overlay/tmp/MARIADB_BUILD b/10.11/overlay/tmp/MARIADB_BUILD
@@ -1 +1 @@
-10.11.12
+10.11.13
diff --git a/11.2/DEBIAN_NAME b/11.2/DEBIAN_NAME
diff --git a/11.2/Dockerfile b/11.2/Dockerfile
diff --git a/11.2/overlay/etc/apt/sources.list.d/mariadb.sources b/11.2/overlay/etc/apt/sources.list.d/mariadb.sources
diff --git a/11.2/overlay/tmp/MARIADB_BUILD b/11.2/overlay/tmp/MARIADB_BUILD
diff --git a/11.4/Dockerfile b/11.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/debian-s6:bookworm-3.0.3
+FROM ghcr.io/bfren/debian-s6:bookworm-3.0.4
 
 ARG BF_IMAGE
 ARG BF_PUBLISHING
diff --git a/11.4/overlay/etc/apt/sources.list.d/mariadb.sources b/11.4/overlay/etc/apt/sources.list.d/mariadb.sources
@@ -2,7 +2,7 @@
 # https://mariadb.org/download/
 X-Repolib-Name: MariaDB
 Types: deb
-URIs: https://mirror.mariadb.org/repo/11.4.6/debian
+URIs: https://mirror.mariadb.org/repo/11.4.7/debian https://mariadb.gb.ssimn.org/repo/11.4.7/debian
 Suites: bookworm
 Components: main
 Signed-By: /etc/apt/keyrings/mariadb-keyring.pgp
diff --git a/11.4/overlay/tmp/MARIADB_BUILD b/11.4/overlay/tmp/MARIADB_BUILD
@@ -1 +1 @@
-11.4.6
+11.4.7
diff --git a/11.7/Dockerfile b/11.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/debian-s6:bookworm-3.0.3
+FROM ghcr.io/bfren/debian-s6:bookworm-3.0.4
 
 ARG BF_IMAGE
 ARG BF_PUBLISHING
diff --git a/11.7/overlay/etc/apt/sources.list.d/mariadb.sources b/11.7/overlay/etc/apt/sources.list.d/mariadb.sources
@@ -2,7 +2,7 @@
 # https://mariadb.org/download/
 X-Repolib-Name: MariaDB
 Types: deb
-URIs: https://mirror.mariadb.org/repo/11.7.2/debian
+URIs: https://mirror.mariadb.org/repo/11.7.2/debian https://mariadb.gb.ssimn.org/repo/11.7.2/debian
 Suites: bookworm
 Components: main
 Signed-By: /etc/apt/keyrings/mariadb-keyring.pgp
diff --git a/11.8/Dockerfile b/11.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/debian-s6:bookworm-3.0.3
+FROM ghcr.io/bfren/debian-s6:bookworm-3.0.4
 
 ARG BF_IMAGE
 ARG BF_PUBLISHING
diff --git a/11.8/overlay/etc/apt/sources.list.d/mariadb.sources b/11.8/overlay/etc/apt/sources.list.d/mariadb.sources
@@ -2,7 +2,7 @@
 # https://mariadb.org/download/
 X-Repolib-Name: MariaDB
 Types: deb
-URIs: https://mirror.mariadb.org/repo/11.8.1/debian
+URIs: https://mirror.mariadb.org/repo/11.8.1/debian https://mariadb.gb.ssimn.org/repo/11.8.1/debian
 Suites: bookworm
 Components: main
 Signed-By: /etc/apt/keyrings/mariadb-keyring.pgp
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-7.1.5
+7.1.6
diff --git a/generate.sh b/generate.sh
@@ -4,11 +4,11 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-DEBIAN_BASE_REVISION="3.0.3"
+DEBIAN_BASE_REVISION="3.0.4"
 ALPINE_BASE_REVISION="5.5.4"
 
 echo "Debian Base: ${DEBIAN_BASE_REVISION}"
-MARIADB_VERSIONS="10.11 11.2 11.4 11.7 11.8"
+MARIADB_VERSIONS="10.11 11.4 11.7 11.8"
 for V in ${MARIADB_VERSIONS} ; do
 
     echo "MariaDB ${V}"
diff --git a/mariadb.sources.esh b/mariadb.sources.esh
@@ -2,7 +2,7 @@
 # https://mariadb.org/download/
 X-Repolib-Name: MariaDB
 Types: deb
-URIs: https://mirror.mariadb.org/repo/<%= ${MARIADB_VERSION} %>/debian
+URIs: https://mirror.mariadb.org/repo/<%= ${MARIADB_VERSION} %>/debian https://mariadb.gb.ssimn.org/repo/<%= ${MARIADB_VERSION} %>/debian
 Suites: <%= ${DEBIAN_NAME} %>
 Components: main
 Signed-By: <%= ${MARIADB_KEYRING} %>

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ jobs:`
`14`	`14`	`strategy:`
`15`	`15`	`fail-fast: false`
`16`	`16`	`matrix:`
`17`		`- mariadb: [ "10.11", "11.2", "11.4", "11.7", "11.8" ]`
	`17`	`+ mariadb: [ "10.11", "11.4", "11.7", "11.8" ]`
`18`	`18`	`runs-on: ubuntu-latest`
`19`	`19`	`steps:`
`20`	`20`	`-`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ jobs:`
`10`	`10`	`strategy:`
`11`	`11`	`fail-fast: false`
`12`	`12`	`matrix:`
`13`		`- mariadb: [ "10.11", "11.2", "11.4", "11.7", "11.8" ]`
	`13`	`+ mariadb: [ "10.11", "11.4", "11.7", "11.8" ]`
`14`	`14`	`runs-on: ubuntu-latest`
`15`	`15`	`steps:`
`16`	`16`	`-`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ghcr.io/bfren/debian-s6:bookworm-3.0.3`
	`1`	`+FROM ghcr.io/bfren/debian-s6:bookworm-3.0.4`
`2`	`2`
`3`	`3`	`ARG BF_IMAGE`
`4`	`4`	`ARG BF_PUBLISHING`