From f6292715dfbef87ed37d4aaf91ed1da11a5221cf Mon Sep 17 00:00:00 2001 From: Lars Gierth Date: Fri, 26 Aug 2016 01:35:04 +0200 Subject: [PATCH] docker: switch to alpine dev channel, for go1.7 Go 1.7 funnily demands gcc for installing gx. License: MIT Signed-off-by: Lars Gierth --- Dockerfile | 6 +++--- Dockerfile.fast | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index f2aa925425e..7efa81ea7fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.4 +FROM alpine:edge MAINTAINER Lars Gierth # There is a copy of this Dockerfile called Dockerfile.fast, @@ -36,7 +36,7 @@ ENV SRC_PATH /go/src/github.com/ipfs/go-ipfs # Get the go-ipfs sourcecode COPY . $SRC_PATH -RUN apk add --update musl go git bash wget ca-certificates \ +RUN apk add --update musl-dev gcc go git bash wget ca-certificates \ # Setup user and fs-repo directory && mkdir -p $IPFS_PATH \ && adduser -D -h $IPFS_PATH -u 1000 ipfs \ @@ -58,7 +58,7 @@ RUN apk add --update musl go git bash wget ca-certificates \ && cp $SRC_PATH/bin/container_daemon /usr/local/bin/start_ipfs \ && chmod 755 /usr/local/bin/start_ipfs \ # Remove all build-time dependencies - && apk del --purge musl go git && rm -rf $GOPATH && rm -vf $IPFS_PATH/api + && apk del --purge musl-dev gcc go git && rm -rf $GOPATH && rm -vf $IPFS_PATH/api # Call uid 1000 "ipfs" USER ipfs diff --git a/Dockerfile.fast b/Dockerfile.fast index 7ead03bbed5..0993920b3a7 100644 --- a/Dockerfile.fast +++ b/Dockerfile.fast @@ -1,4 +1,4 @@ -FROM alpine:3.4 +FROM alpine:edge MAINTAINER Lars Gierth # This is a copy of /Dockerfile, @@ -28,7 +28,7 @@ ENV SRC_PATH /go/src/github.com/ipfs/go-ipfs # and trigger a re-run of all following commands. COPY ./package.json $SRC_PATH/package.json -RUN apk add --update musl go git bash wget ca-certificates \ +RUN apk add --update musl-dev gcc go git bash wget ca-certificates \ && mkdir -p $IPFS_PATH \ && adduser -D -h $IPFS_PATH -u 1000 ipfs \ && chown ipfs:ipfs $IPFS_PATH && chmod 755 $IPFS_PATH \ @@ -48,7 +48,7 @@ RUN cd $SRC_PATH \ && cp ipfs /usr/local/bin/ipfs \ && cp $SRC_PATH/bin/container_daemon /usr/local/bin/start_ipfs \ && chmod 755 /usr/local/bin/start_ipfs \ - && apk del --purge musl go git && rm -rf $GOPATH && rm -vf $IPFS_PATH/api + && apk del --purge musl-dev gcc go git && rm -rf $GOPATH && rm -vf $IPFS_PATH/api USER ipfs VOLUME $IPFS_PATH