Skip to content

Commit d6028cf

Browse files
committed
Use edge instead of main
This is a temporary commit that should solve #76 and supersede #80 Noted in the upstream issues, edge contains newer packages that resolve the issue This entire commit can be reverted once main has mariadb 10.5.9 and possibly musl 1.2.2-r2
1 parent 35ae549 commit d6028cf

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

.github/workflows/external_trigger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
fi
1919
echo "**** External trigger running off of alpine branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_MARIADB_ALPINE\". ****"
2020
echo "**** Retrieving external version ****"
21-
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
21+
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
2222
&& awk '/^P:'"mariadb"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
2323
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
2424
echo "**** Can't retrieve external version, exiting ****"

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ RUN \
1717
curl && \
1818
echo "**** install runtime packages ****" && \
1919
if [ -z ${MARIADB_VERSION+x} ]; then \
20-
MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
20+
MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
2121
&& awk '/^P:mariadb$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
2222
fi && \
23-
apk add --no-cache \
23+
apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main/ \
2424
gnupg \
2525
mariadb==${MARIADB_VERSION} \
2626
mariadb-backup==${MARIADB_VERSION} \

Dockerfile.aarch64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ RUN \
1717
curl && \
1818
echo "**** install runtime packages ****" && \
1919
if [ -z ${MARIADB_VERSION+x} ]; then \
20-
MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
20+
MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
2121
&& awk '/^P:mariadb$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
2222
fi && \
23-
apk add --no-cache \
23+
apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main/ \
2424
gnupg \
2525
mariadb==${MARIADB_VERSION} \
2626
mariadb-backup==${MARIADB_VERSION} \

Dockerfile.armhf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ RUN \
1717
curl && \
1818
echo "**** install runtime packages ****" && \
1919
if [ -z ${MARIADB_VERSION+x} ]; then \
20-
MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
20+
MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
2121
&& awk '/^P:mariadb$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
2222
fi && \
23-
apk add --no-cache \
23+
apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main/ \
2424
gnupg \
2525
mariadb==${MARIADB_VERSION} \
2626
mariadb-backup==${MARIADB_VERSION} \

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pipeline {
2525
PR_DOCKERHUB_IMAGE = 'lspipepr/mariadb'
2626
DIST_IMAGE = 'alpine'
2727
DIST_TAG = '3.13'
28-
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.13/main/'
28+
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/edge/main/'
2929
DIST_REPO_PACKAGES = 'mariadb'
3030
MULTIARCH='true'
3131
CI='true'

jenkins-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ repo_vars:
1616
- PR_DOCKERHUB_IMAGE = 'lspipepr/mariadb'
1717
- DIST_IMAGE = 'alpine'
1818
- DIST_TAG = '3.13'
19-
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.13/main/'
19+
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/edge/main/'
2020
- DIST_REPO_PACKAGES = 'mariadb'
2121
- MULTIARCH='true'
2222
- CI='true'

0 commit comments

Comments
 (0)