docker: make dockerfile differences more obvious
License: MIT Signed-off-by: Lars Gierth <larsg@systemli.org>
Lars Gierth committed
Jun 3, 2016 at 02:12 UTC
00ae31cbddf7b083c35c6f5b30807ada564d83b4
4 files changed
+4
-6
Dockerfile
+1
-1
@@ -1,7 +1,7 @@
1
FROM alpine:3.3
2
MAINTAINER Lars Gierth <lgierth@ipfs.io>
3
4
-# There is a copy of this Dockerfile in test/sharness,
4
+# There is a copy of this Dockerfile called Dockerfile.fast,
5
# which is optimized for build time, instead of image size.
6
#
7
# Please keep these two Dockerfiles in sync.
Dockerfile.fast
renamed
+1
-3
@@ -1,12 +1,10 @@
1
FROM alpine:3.3
2
MAINTAINER Lars Gierth <lgierth@ipfs.io>
3
4
-# This is a copy of the root Dockerfile,
4
+# This is a copy of /Dockerfile,
5
# except that we optimize for build time, instead of image size.
6
#
7
# Please keep these two Dockerfiles in sync.
8
-#
9
-# Only sections different from the root Dockerfile are commented.
8
9
10
EXPOSE 4001
test/3nodetest/Makefile
+1
-1
@@ -25,7 +25,7 @@ bin/random: $(RANDOMSRC)/**/*.go
25
# just build it every time... this part isn't
26
# even the lengthy part, and it decreases pain.
27
docker_ipfs_image:
28
- docker build -t $(IMAGE_NAME) -f test/Dockerfile .
28
+ docker build -t $(IMAGE_NAME) -f Dockerfile.fast .
29
docker images | grep $(IMAGE_NAME)
30
31
clean:
test/sharness/t0300-docker-image.sh
+1
-1
@@ -33,7 +33,7 @@ TEST_TESTS_DIR=$(dirname "$TEST_SCRIPTS_DIR")
33
APP_ROOT_DIR=$(dirname "$TEST_TESTS_DIR")
34
35
test_expect_success "docker image build succeeds" '
36
- docker_build "$TEST_TESTS_DIR/Dockerfile" "$APP_ROOT_DIR" >actual ||
36
+ docker_build "$TEST_TESTS_DIR/../Dockerfile.fast" "$APP_ROOT_DIR" >actual ||
37
test_fsh echo "TEST_TESTS_DIR: $TEST_TESTS_DIR" ||
38
test_fsh echo "APP_ROOT_DIR : $APP_ROOT_DIR" ||
39
test_fsh cat actual