Skip to content

Commit 15b458e

Browse files
bfrenbfren
authored
v7.0.7 (#193)
Minor updates * Using latest base images * Using new /test executable * Using latest base images * Removing MariaDB 11.1 and 11.5 (EOL) * Updating to MariaDB 11.6.2 * Adding MariaDB 11.7.1
1 parent 41ed458 commit 15b458e

File tree

25 files changed

+24
-76
lines changed

25 files changed

+24
-76
lines changed

‎.github/workflows/dev-alpine.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
name: Run tests
7171
id: docker_test
7272
run: |
73-
docker run --entrypoint "/usr/bin/env" ${{ env.TEST_TAG }} -i nu -c "use bf test ; test"
73+
docker run --entrypoint /test ${{ env.TEST_TAG }}
7474
-
7575
name: Build and push
7676
id: docker_build

‎.github/workflows/dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
mariadb: [ "10.5", "10.6", "10.11", "11.1", "11.2", "11.4", "11.5", "11.6" ]
17+
mariadb: [ "10.5", "10.6", "10.11", "11.2", "11.4", "11.6", "11.7" ]
1818
runs-on: ubuntu-latest
1919
steps:
2020
-
@@ -64,7 +64,7 @@ jobs:
6464
name: Run tests
6565
id: docker_test
6666
run: |
67-
docker run --entrypoint "/usr/bin/env" ${{ env.TEST_TAG }} -i nu -c "use bf test ; test"
67+
docker run --entrypoint /test ${{ env.TEST_TAG }}
6868
-
6969
name: Build and push
7070
id: docker_build

‎.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
mariadb: [ "10.5", "10.6", "10.11", "11.1", "11.2", "11.4", "11.5", "11.6" ]
13+
mariadb: [ "10.5", "10.6", "10.11", "11.2", "11.4", "11.6", "11.7" ]
1414
runs-on: ubuntu-latest
1515
steps:
1616
-

‎10.11/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/bfren/debian-s6:bookworm-2.2.13
1+
FROM ghcr.io/bfren/debian-s6:bookworm-2.2.15
22

33
ARG BF_IMAGE
44
ARG BF_PUBLISHING

‎10.5/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/bfren/debian-s6:bullseye-2.2.13
1+
FROM ghcr.io/bfren/debian-s6:bullseye-2.2.15
22

33
ARG BF_IMAGE
44
ARG BF_PUBLISHING

‎10.6/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/bfren/debian-s6:bullseye-2.2.13
1+
FROM ghcr.io/bfren/debian-s6:bullseye-2.2.15
22

33
ARG BF_IMAGE
44
ARG BF_PUBLISHING

‎11.1/overlay/etc/apt/sources.list.d/mariadb.sources

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎11.1/overlay/tmp/MARIADB_BUILD

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎11.2/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/bfren/debian-s6:bookworm-2.2.13
1+
FROM ghcr.io/bfren/debian-s6:bookworm-2.2.15
22

33
ARG BF_IMAGE
44
ARG BF_PUBLISHING

‎11.4/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/bfren/debian-s6:bookworm-2.2.13
1+
FROM ghcr.io/bfren/debian-s6:bookworm-2.2.15
22

33
ARG BF_IMAGE
44
ARG BF_PUBLISHING

‎11.5/DEBIAN_NAME

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎11.5/Dockerfile

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎11.5/overlay/tmp/MARIADB_BUILD

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎11.6/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/bfren/debian-s6:bookworm-2.2.13
1+
FROM ghcr.io/bfren/debian-s6:bookworm-2.2.15
22

33
ARG BF_IMAGE
44
ARG BF_PUBLISHING

‎11.6/overlay/etc/apt/sources.list.d/mariadb.sources

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# https://mariadb.org/download/
33
X-Repolib-Name: MariaDB
44
Types: deb
5-
URIs: https://mariadb.gb.ssimn.org/repo/11.6.1/debian
5+
URIs: https://mariadb.gb.ssimn.org/repo/11.6.2/debian
66
Suites: bookworm
77
Components: main
88
Signed-By: /etc/apt/keyrings/mariadb-keyring.pgp

‎11.6/overlay/tmp/MARIADB_BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
11.6.1
1+
11.6.2

‎11.1/DEBIAN_NAME renamed to ‎11.7/DEBIAN_NAME

File renamed without changes.

‎11.1/Dockerfile renamed to ‎11.7/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/bfren/debian-s6:bookworm-2.2.13
1+
FROM ghcr.io/bfren/debian-s6:bookworm-2.2.15
22

33
ARG BF_IMAGE
44
ARG BF_PUBLISHING
@@ -36,7 +36,7 @@ ENV \
3636
BF_DB_LOG_WARNINGS=3
3737

3838
COPY ./overlay /
39-
COPY ./11.1/overlay /
39+
COPY ./11.7/overlay /
4040
RUN bf-install
4141

4242
VOLUME [ "/backup", "/data", "/ssl" ]

‎11.5/overlay/etc/apt/sources.list.d/mariadb.sources renamed to ‎11.7/overlay/etc/apt/sources.list.d/mariadb.sources

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# MariaDB 11.5 repository list
1+
# MariaDB 11.7 repository list
22
# https://mariadb.org/download/
33
X-Repolib-Name: MariaDB
44
Types: deb
5-
URIs: https://mariadb.gb.ssimn.org/repo/11.5.2/debian
5+
URIs: https://mariadb.gb.ssimn.org/repo/11.7.1/debian
66
Suites: bookworm
77
Components: main
88
Signed-By: /etc/apt/keyrings/mariadb-keyring.pgp

‎11.7/overlay/tmp/MARIADB_BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
11.7.1

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.0.6
1+
7.0.7

‎alpine3.17/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/bfren/alpine-s6:alpine3.17-5.4.13
1+
FROM ghcr.io/bfren/alpine-s6:alpine3.17-5.4.15
22

33
ARG BF_IMAGE
44
ARG BF_PUBLISHING

‎alpine3.20/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.13
1+
FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.15
22

33
ARG BF_IMAGE
44
ARG BF_PUBLISHING

‎generate.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ set -euo pipefail
44

55
docker pull bfren/alpine
66

7-
DEBIAN_BASE_REVISION="2.2.13"
8-
ALPINE_BASE_REVISION="5.4.13"
7+
DEBIAN_BASE_REVISION="2.2.15"
8+
ALPINE_BASE_REVISION="5.4.15"
99

1010
echo "Debian Base: ${DEBIAN_BASE_REVISION}"
11-
MARIADB_VERSIONS="10.5 10.6 10.11 11.1 11.2 11.4 11.5 11.6"
11+
MARIADB_VERSIONS="10.5 10.6 10.11 11.2 11.4 11.6 11.7"
1212
for V in ${MARIADB_VERSIONS} ; do
1313

1414
echo "MariaDB ${V}"

‎test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ docker buildx build \
1313
-t ${TAG} \
1414
. \
1515
&& \
16-
docker run --entrypoint "/usr/bin/env" ${TAG} -i nu -c "use bf test ; test"
16+
docker run --entrypoint /test ${TAG}

0 commit comments

Comments
 (0)