Skip to content

Commit 97f4fc4

Browse files
bfrenbfren
authored
v7.1.0 (#194)
Major updates * Adding Alpine 3.21 with MariaDB 11.4 Minor updates * Using latest base images
1 parent 15b458e commit 97f4fc4

File tree

21 files changed

+62
-18
lines changed

21 files changed

+62
-18
lines changed

‎.github/workflows/dev-alpine.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
alpine: [ "3.17", "3.20" ]
17+
alpine: [ "3.17", "3.20", "3.21" ]
1818
runs-on: ubuntu-latest
1919
steps:
2020
-

‎.github/workflows/publish-alpine.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-
alpine: [ "3.17", "3.20" ]
13+
alpine: [ "3.17", "3.20", "3.21" ]
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.15
1+
FROM ghcr.io/bfren/debian-s6:bookworm-2.2.16
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.15
1+
FROM ghcr.io/bfren/debian-s6:bullseye-2.2.16
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.15
1+
FROM ghcr.io/bfren/debian-s6:bullseye-2.2.16
22

33
ARG BF_IMAGE
44
ARG BF_PUBLISHING

‎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.15
1+
FROM ghcr.io/bfren/debian-s6:bookworm-2.2.16
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.15
1+
FROM ghcr.io/bfren/debian-s6:bookworm-2.2.16
22

33
ARG BF_IMAGE
44
ARG BF_PUBLISHING

‎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.15
1+
FROM ghcr.io/bfren/debian-s6:bookworm-2.2.16
22

33
ARG BF_IMAGE
44
ARG BF_PUBLISHING

‎11.7/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.15
1+
FROM ghcr.io/bfren/debian-s6:bookworm-2.2.16
22

33
ARG BF_IMAGE
44
ARG BF_PUBLISHING

‎VERSION

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

‎VERSION_MINOR

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.0
1+
7.1

‎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.15
1+
FROM ghcr.io/bfren/alpine-s6:alpine3.17-5.5.0
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.15
1+
FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.5.0
22

33
ARG BF_IMAGE
44
ARG BF_PUBLISHING

‎alpine3.21/Dockerfile

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
FROM ghcr.io/bfren/alpine-s6:alpine3.21-5.5.0
2+
3+
ARG BF_IMAGE
4+
ARG BF_PUBLISHING
5+
ARG BF_VERSION
6+
7+
EXPOSE 3306
8+
9+
ENV \
10+
# set to "1" to give the application user permission to access all databases and manage users
11+
# should NOT be used in production, but is extremely useful for a dev server
12+
BF_DB_USER_SUPER=0 \
13+
# set to "1" to compress backup sql files
14+
BF_DB_BACKUP_COMPRESS_FILES=0 \
15+
# the period of time to keep backups before auto-deleting them (Nu duration)
16+
BF_DB_BACKUP_KEEP_FOR=28day \
17+
# set to "1" to enable SSL support
18+
BF_DB_SSL_ENABLE=0 \
19+
# the period of time before self-generated SSL certificates will expire (Nu duration)
20+
BF_DB_SSL_EXPIRY=36500day \
21+
# the size in bits of the CA SSL private key
22+
BF_DB_SSL_CA_KEY_BITS=4096 \
23+
# the size in bits of the server SSL private key
24+
BF_DB_SSL_SERVER_KEY_BITS=4096 \
25+
# the size in bits of the client SSL private key
26+
BF_DB_SSL_CLIENT_KEY_BITS=4096 \
27+
# see https://mariadb.com/kb/en/server-system-variables/#character_set_server
28+
BF_DB_CHARACTER_SET=utf8 \
29+
# see https://mariadb.com/kb/en/server-system-variables/#collation_server
30+
BF_DB_COLLATION=utf8_general_ci \
31+
# see https://mariadb.com/kb/en/server-system-variables/#log_warnings
32+
BF_DB_LOG_WARNINGS=3
33+
34+
COPY ./overlay /
35+
COPY ./overlay-alpine /
36+
COPY ./alpine3.21/overlay /
37+
RUN bf-install
38+
39+
40+
VOLUME [ "/backup", "/data", "/ssl" ]

‎alpine3.21/overlay/tmp/MARIADB_BUILD

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

‎alpine3.21/overlay/tmp/MARIADB_MAJOR

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

‎alpine3.21/overlay/tmp/MARIADB_MINOR

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

‎alpine3.21/overlay/tmp/MARIADB_REVISION

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

‎generate.sh

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

55
docker pull bfren/alpine
66

7-
DEBIAN_BASE_REVISION="2.2.15"
8-
ALPINE_BASE_REVISION="5.4.15"
7+
DEBIAN_BASE_REVISION="2.2.16"
8+
ALPINE_BASE_REVISION="5.5.0"
99

1010
echo "Debian Base: ${DEBIAN_BASE_REVISION}"
1111
MARIADB_VERSIONS="10.5 10.6 10.11 11.2 11.4 11.6 11.7"
@@ -45,7 +45,7 @@ for V in ${MARIADB_VERSIONS} ; do
4545
done
4646

4747
echo "Alpine Base: ${ALPINE_BASE_REVISION}"
48-
ALPINE_EDITIONS="3.17 3.20"
48+
ALPINE_EDITIONS="3.17 3.20 3.21"
4949
for V in ${ALPINE_EDITIONS} ; do
5050

5151
echo "Alpine ${V}"

‎run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
IMAGE=`cat VERSION`
4-
MARIADB=${1:-11.5}
4+
MARIADB=${1:-11.7}
55
VOL_BACKUP=`pwd`/backup
66
VOL_DATA=`pwd`/data
77
VOL_SSL=`pwd`/ssl

‎test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
IMAGE=mariadb
44
VERSION=`cat VERSION`
5-
MARIADB=${1:-11.5}
5+
MARIADB=${1:-11.7}
66
TAG=${IMAGE}-test
77

88
docker buildx build \

0 commit comments

Comments
 (0)