From 8ea687304f9be03d609c712df1e9debd96642e8f Mon Sep 17 00:00:00 2001 From: nemchik Date: Mon, 8 Feb 2021 10:28:29 -0600 Subject: [PATCH] temporarily forcing MARIADB_VERSION This can revert once https://github.com/linuxserver/docker-jenkins-builder/pull/90 merges --- Dockerfile | 3 +++ Dockerfile.aarch64 | 3 +++ Dockerfile.armhf | 3 +++ 3 files changed, 9 insertions(+) diff --git a/Dockerfile b/Dockerfile index afcfff5..45cab74 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,9 @@ ENV MYSQL_DIR="/config" ENV DATADIR=$MYSQL_DIR/databases RUN \ + echo "**** temporarily forcing MARIADB_VERSION ****" && \ + MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + && awk '/^P:mariadb$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ echo "**** install runtime packages ****" && \ if [ -z ${MARIADB_VERSION+x} ]; then \ MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index debb7af..4c79446 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -12,6 +12,9 @@ ENV MYSQL_DIR="/config" ENV DATADIR=$MYSQL_DIR/databases RUN \ + echo "**** temporarily forcing MARIADB_VERSION ****" && \ + MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + && awk '/^P:mariadb$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ echo "**** install runtime packages ****" && \ if [ -z ${MARIADB_VERSION+x} ]; then \ MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 2f67548..4094e6c 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -12,6 +12,9 @@ ENV MYSQL_DIR="/config" ENV DATADIR=$MYSQL_DIR/databases RUN \ + echo "**** temporarily forcing MARIADB_VERSION ****" && \ + MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + && awk '/^P:mariadb$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ echo "**** install runtime packages ****" && \ if [ -z ${MARIADB_VERSION+x} ]; then \ MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \