1
0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-28 17:03:58 +08:00

Merge pull request #2929 from ipfs/feature/docker-go-update

docker: remove go version constraint
This commit is contained in:
Jeromy Johnson
2016-07-01 08:46:39 -07:00
committed by GitHub
2 changed files with 2 additions and 4 deletions

View File

@ -29,7 +29,6 @@ ENV IPFS_PATH /data/ipfs
# The default logging level # The default logging level
ENV IPFS_LOGGING "" ENV IPFS_LOGGING ""
# Golang stuff # Golang stuff
ENV GO_VERSION 1.6.2-r2
ENV GOPATH /go ENV GOPATH /go
ENV PATH /go/bin:$PATH ENV PATH /go/bin:$PATH
ENV SRC_PATH /go/src/github.com/ipfs/go-ipfs 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 # Get the go-ipfs sourcecode
COPY . $SRC_PATH 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 # Setup user and fs-repo directory
&& mkdir -p $IPFS_PATH \ && mkdir -p $IPFS_PATH \
&& adduser -D -h $IPFS_PATH -u 1000 ipfs \ && adduser -D -h $IPFS_PATH -u 1000 ipfs \

View File

@ -15,7 +15,6 @@ EXPOSE 8080
ENV GX_IPFS "" ENV GX_IPFS ""
ENV IPFS_PATH /data/ipfs ENV IPFS_PATH /data/ipfs
ENV IPFS_LOGGING "" ENV IPFS_LOGGING ""
ENV GO_VERSION 1.6.2-r2
ENV GOPATH /go ENV GOPATH /go
ENV PATH /go/bin:$PATH ENV PATH /go/bin:$PATH
ENV SRC_PATH /go/src/github.com/ipfs/go-ipfs 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. # and trigger a re-run of all following commands.
COPY ./package.json $SRC_PATH/package.json 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 \ && mkdir -p $IPFS_PATH \
&& adduser -D -h $IPFS_PATH -u 1000 ipfs \ && adduser -D -h $IPFS_PATH -u 1000 ipfs \
&& chown ipfs:ipfs $IPFS_PATH && chmod 755 $IPFS_PATH \ && chown ipfs:ipfs $IPFS_PATH && chmod 755 $IPFS_PATH \