build: comply with docker best practice.

Signed-off-by: Fan, Shang Xiang <[email protected]>
CENGN · Oct 16, 2018 · 3d7c650 · 3d7c650
1 parent 0c32013
commit 3d7c650
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/images/ceph/Dockerfile b/images/ceph/Dockerfile
@@ -23,8 +23,8 @@ ARG ARCH
 ARG TINI_VERSION
 
 # Run tini as PID 1 and avoid signal handling issues
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH} /tini
-RUN chmod +x /tini
+RUN curl --fail -sSL -o /tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH} && \
+    chmod +x /tini
 
 COPY rook rookflex toolbox.sh /usr/local/bin/
 

diff --git a/images/cockroachdb/Dockerfile b/images/cockroachdb/Dockerfile
@@ -14,7 +14,7 @@
 
 FROM cockroachdb/cockroach:v2.0.2
 
-ADD rook /usr/local/bin/
+COPY rook /usr/local/bin/
 
 ENTRYPOINT ["/usr/local/bin/rook"]
 CMD [""]
diff --git a/images/cross/Dockerfile b/images/cross/Dockerfile
@@ -49,8 +49,8 @@ ARG ARCH
 ARG TINI_VERSION
 
 # Run tini as PID 1 and avoid signal handling issues
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH} /tini
-RUN chmod +x /tini
+RUN curl -sSL --fail -o /tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH} && \
+    chmod +x /tini
 
 # precompile the go standard library for all supported platforms and configurations
 # the install suffixes match those in golang.mk so please keep them in sync

diff --git a/images/minio/Dockerfile b/images/minio/Dockerfile
@@ -14,7 +14,7 @@
 
 FROM minio/minio:RELEASE.2018-04-19T22-54-58Z
 
-ADD rook /usr/local/bin/
+COPY rook /usr/local/bin/
 
 ENTRYPOINT ["/usr/local/bin/rook"]
 CMD [""]
diff --git a/images/nfs/Dockerfile b/images/nfs/Dockerfile
@@ -47,7 +47,7 @@ COPY start.sh /
 
 EXPOSE 2049 38465-38467 662 111/udp 111
 
-ADD rook /usr/local/bin/
+COPY rook /usr/local/bin/
 
 ENTRYPOINT ["/usr/local/bin/rook"]
 CMD [""]