Update dockerfiles
This commit is contained in:
parent
8180ef18ff
commit
597863921a
|
@ -20,7 +20,9 @@ run %q[ apk add -U --no-cache wget ca-certificates \
|
||||||
run %q[ apk add -U --no-cache curl \
|
run %q[ apk add -U --no-cache curl \
|
||||||
&& cd /usr/bin && curl https://xena.greedo.xeserv.us/files/httpagent.gz -o httpagent.gz \
|
&& cd /usr/bin && curl https://xena.greedo.xeserv.us/files/httpagent.gz -o httpagent.gz \
|
||||||
&& gunzip 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
|
# Add glue and vardene
|
||||||
run %q[ apk add -U --no-cache wget \
|
run %q[ apk add -U --no-cache wget \
|
||||||
|
|
|
@ -2,9 +2,8 @@ FROM xena/alpine
|
||||||
|
|
||||||
RUN apk add --no-cache ca-certificates
|
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_URL https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz
|
||||||
ENV GOLANG_SRC_SHA256 4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc
|
|
||||||
|
|
||||||
# https://golang.org/issue/14851
|
# https://golang.org/issue/14851
|
||||||
COPY no-pic.patch /
|
COPY no-pic.patch /
|
||||||
|
@ -20,7 +19,6 @@ RUN set -ex \
|
||||||
&& export GOROOT_BOOTSTRAP="$(go env GOROOT)" \
|
&& export GOROOT_BOOTSTRAP="$(go env GOROOT)" \
|
||||||
\
|
\
|
||||||
&& wget -q "$GOLANG_SRC_URL" -O golang.tar.gz \
|
&& 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 \
|
&& tar -C /usr/local -xzf golang.tar.gz \
|
||||||
&& rm golang.tar.gz \
|
&& rm golang.tar.gz \
|
||||||
&& cd /usr/local/go/src \
|
&& cd /usr/local/go/src \
|
||||||
|
|
|
@ -5,7 +5,7 @@ ENV NIM_VERSION 0.16.0
|
||||||
ENV NIM_DOWNLOAD_URL http://nim-lang.org/download/nim-$NIM_VERSION.tar.xz
|
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 && \
|
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/* && \
|
rm -rf /var/cache/apk/* && \
|
||||||
mkdir -p /opt && cd /opt && \
|
mkdir -p /opt && cd /opt && \
|
||||||
curl -LO $NIM_DOWNLOAD_URL && \
|
curl -LO $NIM_DOWNLOAD_URL && \
|
||||||
|
|
Loading…
Reference in New Issue