stop fetching nobin for s6 overlay and install per architecture version

This commit is contained in:
sparklyballs 2016-07-09 11:14:42 +01:00
parent 2532e980a3
commit 6f90990dde

View file

@ -2,7 +2,10 @@ FROM gliderlabs/alpine:3.4
MAINTAINER sparklyballs MAINTAINER sparklyballs
# set version for s6 overlay # set version for s6 overlay
ARG OVERLAY_VERSION="v1.18.1.0" ARG OVERLAY_VERSION="v1.18.1.3"
ARG OVERLAY_ARCH="amd64"
ARG OVERLAY_URL="https://github.com/just-containers/s6-overlay/releases/download"
ARG OVERLAY_WWW="${OVERLAY_URL}"/"${OVERLAY_VERSION}"/s6-overlay-"${OVERLAY_ARCH}".tar.gz
# set some environment variables # set some environment variables
ENV PS1="$(whoami)@$(hostname):$(pwd)$ " \ ENV PS1="$(whoami)@$(hostname):$(pwd)$ " \
@ -17,8 +20,6 @@ RUN \
apk add --no-cache \ apk add --no-cache \
bash \ bash \
s6 \
s6-portable-utils \
tzdata && \ tzdata && \
apk add --no-cache --repository http://nl.alpinelinux.org/alpine/edge/testing \ apk add --no-cache --repository http://nl.alpinelinux.org/alpine/edge/testing \
@ -27,7 +28,7 @@ apk add --no-cache --repository http://nl.alpinelinux.org/alpine/edge/testing \
# add s6 overlay # add s6 overlay
curl -o \ curl -o \
/tmp/s6-overlay.tar.gz -L \ /tmp/s6-overlay.tar.gz -L \
https://github.com/just-containers/s6-overlay/releases/download/"${OVERLAY_VERSION}"/s6-overlay-nobin.tar.gz && \ "${OVERLAY_WWW}" && \
tar xvfz /tmp/s6-overlay.tar.gz -C / && \ tar xvfz /tmp/s6-overlay.tar.gz -C / && \
# clean up # clean up