Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
dms3
go-dms3
Commits
5012a9d1
Commit
5012a9d1
authored
Oct 23, 2017
by
Jeromy Johnson
Committed by
GitHub
Oct 23, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4330 from ipfs/fix/docker-comments
docker: move comments to avoid "empty continuation lines"
parents
5d7fae60
87408886
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
11 deletions
+9
-11
Dockerfile
Dockerfile
+4
-5
Dockerfile.fast
Dockerfile.fast
+5
-6
No files found.
Dockerfile
View file @
5012a9d1
...
...
@@ -12,24 +12,23 @@ ENV SRC_DIR /go/src/github.com/ipfs/go-ipfs
COPY
. $SRC_DIR
# Build the thing.
# Also: fix getting HEAD commit hash via git rev-parse.
# Also: allow using a custom IPFS API endpoint.
RUN
cd
$SRC_DIR
\
# Required for getting the HEAD commit hash via git rev-parse.
&&
mkdir
.git/objects
\
# Allows using a custom (i.e. local) IPFS API endpoint.
&&
([
-z
"
$GX_IPFS
"
]
||
echo
$GX_IPFS
>
/root/.ipfs/api
)
\
# Build the thing.
&&
make build
# Get su-exec, a very minimal tool for dropping privileges,
# and tini, a very minimal init daemon for containers
ENV
SUEXEC_VERSION v0.2
ENV
TINI_VERSION v0.16.1
RUN
set
-x
\
# Get su-exec, a very minimal tool for dropping privileges
&&
cd
/tmp
\
&&
git clone https://github.com/ncopa/su-exec.git
\
&&
cd
su-exec
\
&&
git checkout
-q
$SUEXEC_VERSION
\
&&
make
\
# Get tini, a very minimal init daemon for containers
&&
cd
/tmp
\
&&
wget
-q
-O
tini https://github.com/krallin/tini/releases/download/
$TINI_VERSION
/tini
\
&&
chmod
+x tini
...
...
Dockerfile.fast
View file @
5012a9d1
...
...
@@ -11,37 +11,36 @@ ENV SRC_DIR /go/src/github.com/ipfs/go-ipfs
COPY ./package.json $SRC_DIR/package.json
# Fetch dependencies.
# Also: allow using a custom IPFS API endpoint.
RUN set -x \
&& go get github.com/whyrusleeping/gx \
&& go get github.com/whyrusleeping/gx-go \
# Allows using a custom (i.e. local) IPFS API endpoint.
&& ([ -z "$GX_IPFS" ] || echo $GX_IPFS > /root/.ipfs/api) \
# Fetch the dependencies so we don't have to do it everytime.
&& cd $SRC_DIR \
&& gx install
COPY . $SRC_DIR
# Build the thing.
# Also: fix getting HEAD commit hash via git rev-parse.
RUN set -x \
&& cd $SRC_DIR \
# Required for getting the HEAD commit hash via git rev-parse.
&& mkdir .git/objects \
# Build the thing.
&& make build \
&& mv cmd/ipfs/ipfs /usr/local/bin/ipfs \
&& mv bin/container_daemon /usr/local/bin/start_ipfs
# Get su-exec, a very minimal tool for dropping privileges,
# and tini, a very minimal init daemon for containers
ENV SUEXEC_VERSION v0.2
ENV TINI_VERSION v0.16.1
RUN set -x \
# Get su-exec, a very minimal tool for dropping privileges
&& cd /tmp \
&& git clone https://github.com/ncopa/su-exec.git \
&& cd su-exec \
&& git checkout -q $SUEXEC_VERSION \
&& make \
# Get tini, a very minimal init daemon for containers
&& cd /tmp \
&& wget -q -O tini https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini \
&& chmod +x tini \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment