v7.1.3 (#197)

bfren · web-flow · commit 388832929c43 · 2025-02-28T14:32:30.000Z
Minor updates
* Using latest base images
* Updating to MariaDB 10.11.11, 11.4.5, 11.7.2
* Adding MariaDB 11.8.1
* Switching Debian mirror
* Removing MariaDB 11.6 (out of support)
* Using string values for bf ch apply
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.6", "11.7" ]
+        mariadb: [ "10.11", "11.2", "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.6", "11.7" ]
+        mariadb: [ "10.11", "11.2", "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.0
+FROM ghcr.io/bfren/debian-s6:bookworm-3.0.1
 
 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://mariadb.gb.ssimn.org/repo/10.11.11/debian
+URIs: https://mirror.mariadb.org/repo/10.11.11/debian
 Suites: bookworm
 Components: main
 Signed-By: /etc/apt/keyrings/mariadb-keyring.pgp
diff --git a/11.2/Dockerfile b/11.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/debian-s6:bookworm-3.0.0
+FROM ghcr.io/bfren/debian-s6:bookworm-3.0.1
 
 ARG BF_IMAGE
 ARG BF_PUBLISHING
diff --git a/11.2/overlay/etc/apt/sources.list.d/mariadb.sources b/11.2/overlay/etc/apt/sources.list.d/mariadb.sources
@@ -2,7 +2,7 @@
 # https://mariadb.org/download/
 X-Repolib-Name: MariaDB
 Types: deb
-URIs: https://mariadb.gb.ssimn.org/repo/11.2.6/debian
+URIs: https://mirror.mariadb.org/repo/11.2.6/debian
 Suites: bookworm
 Components: main
 Signed-By: /etc/apt/keyrings/mariadb-keyring.pgp
diff --git a/11.4/Dockerfile b/11.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/debian-s6:bookworm-3.0.0
+FROM ghcr.io/bfren/debian-s6:bookworm-3.0.1
 
 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://mariadb.gb.ssimn.org/repo/11.4.5/debian
+URIs: https://mirror.mariadb.org/repo/11.4.5/debian
 Suites: bookworm
 Components: main
 Signed-By: /etc/apt/keyrings/mariadb-keyring.pgp
diff --git a/11.6/overlay/tmp/MARIADB_BUILD b/11.6/overlay/tmp/MARIADB_BUILD
diff --git a/11.7/Dockerfile b/11.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/debian-s6:bookworm-3.0.0
+FROM ghcr.io/bfren/debian-s6:bookworm-3.0.1
 
 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://mariadb.gb.ssimn.org/repo/11.7.1/debian
+URIs: https://mirror.mariadb.org/repo/11.7.2/debian
 Suites: bookworm
 Components: main
 Signed-By: /etc/apt/keyrings/mariadb-keyring.pgp
diff --git a/11.7/overlay/tmp/MARIADB_BUILD b/11.7/overlay/tmp/MARIADB_BUILD
@@ -1 +1 @@
-11.7.1
+11.7.2
diff --git a/11.8/DEBIAN_NAME b/11.8/DEBIAN_NAME
diff --git a/11.8/Dockerfile b/11.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/debian-s6:bookworm-3.0.0
+FROM ghcr.io/bfren/debian-s6:bookworm-3.0.1
 
 ARG BF_IMAGE
 ARG BF_PUBLISHING
@@ -36,7 +36,7 @@ ENV \
     BF_DB_LOG_WARNINGS=3
 
 COPY ./overlay /
-COPY ./11.6/overlay /
+COPY ./11.8/overlay /
 RUN bf-install
 
 VOLUME [ "/backup", "/data", "/ssl" ]
diff --git a/11.8/overlay/etc/apt/sources.list.d/mariadb.sources b/11.8/overlay/etc/apt/sources.list.d/mariadb.sources
@@ -1,8 +1,8 @@
-# MariaDB 11.6 repository list
+# MariaDB 11.8 repository list
 # https://mariadb.org/download/
 X-Repolib-Name: MariaDB
 Types: deb
-URIs: https://mariadb.gb.ssimn.org/repo/11.6.2/debian
+URIs: https://mirror.mariadb.org/repo/11.8.1/debian
 Suites: bookworm
 Components: main
 Signed-By: /etc/apt/keyrings/mariadb-keyring.pgp
diff --git a/11.8/overlay/tmp/MARIADB_BUILD b/11.8/overlay/tmp/MARIADB_BUILD
@@ -0,0 +1 @@
+11.8.1
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-7.1.2
+7.1.3
diff --git a/alpine3.17/Dockerfile b/alpine3.17/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/alpine-s6:alpine3.17-5.5.1
+FROM ghcr.io/bfren/alpine-s6:alpine3.17-5.5.2
 
 ARG BF_IMAGE
 ARG BF_PUBLISHING
diff --git a/alpine3.20/Dockerfile b/alpine3.20/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.5.1
+FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.5.2
 
 ARG BF_IMAGE
 ARG BF_PUBLISHING
diff --git a/alpine3.20/overlay/tmp/MARIADB_BUILD b/alpine3.20/overlay/tmp/MARIADB_BUILD
@@ -1 +1 @@
-10.11.10-r0
+10.11.11-r0
diff --git a/alpine3.20/overlay/tmp/MARIADB_REVISION b/alpine3.20/overlay/tmp/MARIADB_REVISION
@@ -1 +1 @@
-10.11.10
+10.11.11
diff --git a/alpine3.21/Dockerfile b/alpine3.21/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/alpine-s6:alpine3.21-5.5.1
+FROM ghcr.io/bfren/alpine-s6:alpine3.21-5.5.2
 
 ARG BF_IMAGE
 ARG BF_PUBLISHING
diff --git a/alpine3.21/overlay/tmp/MARIADB_BUILD b/alpine3.21/overlay/tmp/MARIADB_BUILD
@@ -1 +1 @@
-11.4.4-r1
+11.4.5-r0
diff --git a/alpine3.21/overlay/tmp/MARIADB_REVISION b/alpine3.21/overlay/tmp/MARIADB_REVISION
@@ -1 +1 @@
-11.4.4
+11.4.5
diff --git a/generate.sh b/generate.sh
@@ -4,11 +4,11 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-DEBIAN_BASE_REVISION="3.0.0"
-ALPINE_BASE_REVISION="5.5.1"
+DEBIAN_BASE_REVISION="3.0.1"
+ALPINE_BASE_REVISION="5.5.2"
 
 echo "Debian Base: ${DEBIAN_BASE_REVISION}"
-MARIADB_VERSIONS="10.11 11.2 11.4 11.6 11.7"
+MARIADB_VERSIONS="10.11 11.2 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://mariadb.gb.ssimn.org/repo/<%= ${MARIADB_VERSION} %>/debian
+URIs: https://mirror.mariadb.org/repo/<%= ${MARIADB_VERSION} %>/debian
 Suites: <%= ${DEBIAN_NAME} %>
 Components: main
 Signed-By: <%= ${MARIADB_KEYRING} %>
diff --git a/overlay/etc/nu/scripts/bf-mariadb/init.nu b/overlay/etc/nu/scripts/bf-mariadb/init.nu
@@ -12,7 +12,7 @@ export def install []: nothing -> nothing {
 
     # set server config permissions
     bf write debug "Setting server config permissions."
-    ["/etc/my.cnf*" "dbadm:dbadm" 0440 0750] | bf ch apply
+    ["/etc/my.cnf*" "dbadm:dbadm" "0440" "0750"] | bf ch apply
 }
 
 # Generate the database initialisation script

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.6", "11.7" ]`
	`17`	`+ mariadb: [ "10.11", "11.2", "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.6", "11.7" ]`
	`13`	`+ mariadb: [ "10.11", "11.2", "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.0`
	`1`	`+FROM ghcr.io/bfren/debian-s6:bookworm-3.0.1`
`2`	`2`
`3`	`3`	`ARG BF_IMAGE`
`4`	`4`	`ARG BF_PUBLISHING`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ghcr.io/bfren/alpine-s6:alpine3.17-5.5.1`
	`1`	`+FROM ghcr.io/bfren/alpine-s6:alpine3.17-5.5.2`
`2`	`2`
`3`	`3`	`ARG BF_IMAGE`
`4`	`4`	`ARG BF_PUBLISHING`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.5.1`
	`1`	`+FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.5.2`
`2`	`2`
`3`	`3`	`ARG BF_IMAGE`
`4`	`4`	`ARG BF_PUBLISHING`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ export def install []: nothing -> nothing {`
`12`	`12`
`13`	`13`	`# set server config permissions`
`14`	`14`	`bf write debug "Setting server config permissions."`
`15`		`- ["/etc/my.cnf*" "dbadm:dbadm" 0440 0750] \| bf ch apply`
	`15`	`+ ["/etc/my.cnf*" "dbadm:dbadm" "0440" "0750"] \| bf ch apply`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`# Generate the database initialisation script`