From 533fe52f427adaa9050ed80c3bec5ae772f01b45 Mon Sep 17 00:00:00 2001 From: Tristan Crichton Date: Mon, 29 Mar 2021 12:08:59 +0100 Subject: [PATCH 1/2] Smokeping version call depends on curl --- Dockerfile | 3 ++- Dockerfile.aarch64 | 3 ++- Dockerfile.armhf | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index f595704..671cd4c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,8 @@ COPY tcpping /defaults/ RUN \ echo "**** install packages ****" && \ + apk add --no-cache \ + curl && \ if [ -z ${SMOKEPING_VERSION+x} ]; then \ SMOKEPING_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:smokeping$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ @@ -23,7 +25,6 @@ RUN \ apache-mod-fcgid \ bc \ bind-tools \ - curl \ font-noto-cjk \ openssh-client \ smokeping==${SMOKEPING_VERSION} \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 490fee4..8806bd9 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -12,6 +12,8 @@ COPY tcpping /defaults/ RUN \ echo "**** install packages ****" && \ + apk add --no-cache \ + curl && \ if [ -z ${SMOKEPING_VERSION+x} ]; then \ SMOKEPING_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:smokeping$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ @@ -23,7 +25,6 @@ RUN \ apache-mod-fcgid \ bc \ bind-tools \ - curl \ font-noto-cjk \ openssh-client \ smokeping==${SMOKEPING_VERSION} \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 9e6313e..34a62b6 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -12,6 +12,8 @@ COPY tcpping /defaults/ RUN \ echo "**** install packages ****" && \ + apk add --no-cache \ + curl && \ if [ -z ${SMOKEPING_VERSION+x} ]; then \ SMOKEPING_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:smokeping$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ @@ -23,7 +25,6 @@ RUN \ apache-mod-fcgid \ bc \ bind-tools \ - curl \ font-noto-cjk \ openssh-client \ smokeping==${SMOKEPING_VERSION} \ From f16a1909ff50000a052afbf08d442c796a15ba41 Mon Sep 17 00:00:00 2001 From: Tristan Crichton Date: Mon, 29 Mar 2021 12:17:11 +0100 Subject: [PATCH 2/2] Update changelog as per guidelines --- readme-vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/readme-vars.yml b/readme-vars.yml index 52884be..2192eb6 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -35,6 +35,7 @@ app_setup_block: | # changelog changelogs: + - { date: "29.03.21:", desc: "Dockerfile: Install curl before we call it" } - { date: "23.01.21:", desc: "Rebasing to alpine 3.13." } - { date: "01.06.20:", desc: "Rebasing to alpine 3.12." } - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }