Skip to content

Commit 0c2735e

Browse files
committed
Rebase to Alpine 3.19
Signed-off-by: Eric Nemchik <[email protected]>
1 parent b2f9a69 commit 0c2735e

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

.github/workflows/external_trigger.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_MARIADB_MASTER\". ****"
2121
echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_MARIADB_MASTER\`" >> $GITHUB_STEP_SUMMARY
2222
echo "**** Retrieving external version ****"
23-
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
23+
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
2424
&& awk '/^P:'"mariadb"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
2525
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
2626
echo "**** Can't retrieve external version, exiting ****"
@@ -74,7 +74,7 @@ jobs:
7474
echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
7575
echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY
7676
exit 0
77-
elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"mariadb"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
77+
elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"mariadb"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
7878
echo "**** New version ${EXT_RELEASE} found; but not all arch repos updated yet; exiting ****"
7979
echo "New version ${EXT_RELEASE} found; but not all arch repos updated yet; exiting" >> $GITHUB_STEP_SUMMARY
8080
FAILURE_REASON="New version ${EXT_RELEASE} for mariadb tag latest is detected, however not all arch repos are updated yet. Will try again later."

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:3.18
3+
FROM ghcr.io/linuxserver/baseimage-alpine:3.19
44

55
# set version label
66
ARG BUILD_DATE
@@ -16,7 +16,7 @@ ENV DATADIR=$MYSQL_DIR/databases
1616
RUN \
1717
echo "**** install runtime packages ****" && \
1818
if [ -z ${MARIADB_VERSION+x} ]; then \
19-
MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
19+
MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
2020
&& awk '/^P:mariadb$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
2121
fi && \
2222
apk add --no-cache \

Dockerfile.aarch64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18
3+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19
44

55
# set version label
66
ARG BUILD_DATE
@@ -16,7 +16,7 @@ ENV DATADIR=$MYSQL_DIR/databases
1616
RUN \
1717
echo "**** install runtime packages ****" && \
1818
if [ -z ${MARIADB_VERSION+x} ]; then \
19-
MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
19+
MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
2020
&& awk '/^P:mariadb$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
2121
fi && \
2222
apk add --no-cache \

jenkins-vars.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ repo_vars:
1616
- DEV_DOCKERHUB_IMAGE = 'lsiodev/mariadb'
1717
- PR_DOCKERHUB_IMAGE = 'lspipepr/mariadb'
1818
- DIST_IMAGE = 'alpine'
19-
- DIST_TAG = '3.18'
20-
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.18/main/'
19+
- DIST_TAG = '3.19'
20+
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.19/main/'
2121
- DIST_REPO_PACKAGES = 'mariadb'
2222
- MULTIARCH='true'
2323
- CI='true'

readme-vars.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ param_env_vars:
2828
- { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." }
2929
param_usage_include_vols: true
3030
param_volumes:
31-
- { vol_path: "/config", vol_host_path: "path_to_data", desc: "Contains the db itself and all assorted settings." }
31+
- { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" }
3232
param_usage_include_ports: true
3333
param_ports:
3434
- { external_port: "3306", internal_port: "3306", port_desc: "Mariadb listens on this port." }
@@ -116,6 +116,7 @@ app_setup_block: |
116116
117117
# changelog
118118
changelogs:
119+
- { date: "23.12.23:", desc: "Rebase to Alpine 3.19."}
119120
- { date: "09.06.23:", desc: "Update lc_messages path in shipped custom.cnf to match upstream." }
120121
- { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
121122
- { date: "04.02.23:", desc: "Minor updates to defaults in custom.cnf." }

0 commit comments

Comments
 (0)