Merge pull request #111 from tcrichton/docker_build_dependency

Fixes #121
This commit is contained in:
Roxedus 2021-12-27 08:47:34 +00:00 committed by GitHub
commit 162c114433
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 3 deletions

View File

@ -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} \

View File

@ -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} \

View File

@ -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} \

View File

@ -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." }