From 75b0f596c805fef8a543696726b8fbf689dff3d0 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sun, 14 Feb 2021 10:26:40 -0600 Subject: [PATCH] Remove temp version force --- Dockerfile | 3 --- Dockerfile.aarch64 | 3 --- Dockerfile.armhf | 3 --- 3 files changed, 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index c2d5c9f..11604d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,9 +15,6 @@ RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ curl && \ - 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 25c3752..d74a339 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -15,9 +15,6 @@ RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ curl && \ - 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 5cfe48d..cb01c17 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -15,9 +15,6 @@ RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ curl && \ - 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 \