From 597863921a1431d89530a3f399eeddc3491c145a Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Mon, 13 Feb 2017 07:55:00 -0800 Subject: [PATCH] Update dockerfiles --- base/alpine/box.rb | 4 +++- lang/go/Dockerfile | 4 +--- lang/nim/Dockerfile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/base/alpine/box.rb b/base/alpine/box.rb index dbf690c..069f35b 100644 --- a/base/alpine/box.rb +++ b/base/alpine/box.rb @@ -20,7 +20,9 @@ run %q[ apk add -U --no-cache wget ca-certificates \ run %q[ apk add -U --no-cache curl \ && cd /usr/bin && curl https://xena.greedo.xeserv.us/files/httpagent.gz -o httpagent.gz \ && gunzip httpagent.gz \ - && apk del curl ] + && chmod +x httpagent \ + && ./httpagent -help > /dev/null 2>&1 \ + ; apk del curl && echo upd: 2017-02-05 ] # Add glue and vardene run %q[ apk add -U --no-cache wget \ diff --git a/lang/go/Dockerfile b/lang/go/Dockerfile index a59e448..4cafa8e 100644 --- a/lang/go/Dockerfile +++ b/lang/go/Dockerfile @@ -2,9 +2,8 @@ FROM xena/alpine RUN apk add --no-cache ca-certificates -ENV GOLANG_VERSION 1.7.4 +ENV GOLANG_VERSION 1.7.5 ENV GOLANG_SRC_URL https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz -ENV GOLANG_SRC_SHA256 4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc # https://golang.org/issue/14851 COPY no-pic.patch / @@ -20,7 +19,6 @@ RUN set -ex \ && export GOROOT_BOOTSTRAP="$(go env GOROOT)" \ \ && wget -q "$GOLANG_SRC_URL" -O golang.tar.gz \ - && echo "$GOLANG_SRC_SHA256 golang.tar.gz" | sha256sum -c - \ && tar -C /usr/local -xzf golang.tar.gz \ && rm golang.tar.gz \ && cd /usr/local/go/src \ diff --git a/lang/nim/Dockerfile b/lang/nim/Dockerfile index 1a32778..0ce5a9c 100644 --- a/lang/nim/Dockerfile +++ b/lang/nim/Dockerfile @@ -5,7 +5,7 @@ ENV NIM_VERSION 0.16.0 ENV NIM_DOWNLOAD_URL http://nim-lang.org/download/nim-$NIM_VERSION.tar.xz RUN apk add --no-cache --virtual nim-compiler-deps libc-dev gcc curl libgcc git perl xz tar && \ - apk add --no-cache libressl ca-certificates && \ + apk add --no-cache libressl ca-certificates libcrypto1.0 libssl1.0 && \ rm -rf /var/cache/apk/* && \ mkdir -p /opt && cd /opt && \ curl -LO $NIM_DOWNLOAD_URL && \