From 8cdf819af99e5ef97c707e1f5e0f79f4f592ad7f Mon Sep 17 00:00:00 2001 From: Lars Gierth Date: Fri, 1 Jul 2016 16:33:16 +0200 Subject: [PATCH] docker: remove go version constraint There's only ever one version of a given package per Alpine release, so GO_VERSION is superfluous and only breaks the build if the go packages is updated. License: MIT Signed-off-by: Lars Gierth --- Dockerfile | 3 +-- Dockerfile.fast | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index d8804e374..f2aa92542 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,6 @@ ENV IPFS_PATH /data/ipfs # The default logging level ENV IPFS_LOGGING "" # Golang stuff -ENV GO_VERSION 1.6.2-r2 ENV GOPATH /go ENV PATH /go/bin:$PATH ENV SRC_PATH /go/src/github.com/ipfs/go-ipfs @@ -37,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=$GO_VERSION git bash wget ca-certificates \ +RUN apk add --update musl go git bash wget ca-certificates \ # Setup user and fs-repo directory && mkdir -p $IPFS_PATH \ && adduser -D -h $IPFS_PATH -u 1000 ipfs \ diff --git a/Dockerfile.fast b/Dockerfile.fast index 72c9ff248..7ead03bbe 100644 --- a/Dockerfile.fast +++ b/Dockerfile.fast @@ -15,7 +15,6 @@ EXPOSE 8080 ENV GX_IPFS "" ENV IPFS_PATH /data/ipfs ENV IPFS_LOGGING "" -ENV GO_VERSION 1.6.2-r2 ENV GOPATH /go ENV PATH /go/bin:$PATH ENV SRC_PATH /go/src/github.com/ipfs/go-ipfs @@ -29,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=$GO_VERSION git bash wget ca-certificates \ +RUN apk add --update musl 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 \