opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-26 07:28:20 +08:00
Code Issues Projects Releases Wiki Activity

docker: make dockerfile differences more obvious

Browse Source 
License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
This commit is contained in:
Lars Gierth
2016-06-03 02:12:31 +02:00
parent 994109c731
commit 00ae31cbdd
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -1,7 +1,7 @@
FROM alpine:3.3 FROM alpine:3.3
MAINTAINER Lars Gierth <lgierth@ipfs.io> MAINTAINER Lars Gierth <lgierth@ipfs.io>
# There is a copy of this Dockerfile in test/sharness, # There is a copy of this Dockerfile called Dockerfile.fast,
# which is optimized for build time, instead of image size. # which is optimized for build time, instead of image size.
# #
# Please keep these two Dockerfiles in sync. # Please keep these two Dockerfiles in sync.

4
test/Dockerfile → Dockerfile.fast
View File

@ -1,12 +1,10 @@
FROM alpine:3.3 FROM alpine:3.3
MAINTAINER Lars Gierth <lgierth@ipfs.io> MAINTAINER Lars Gierth <lgierth@ipfs.io>
# This is a copy of the root Dockerfile, # This is a copy of /Dockerfile,
# except that we optimize for build time, instead of image size. # except that we optimize for build time, instead of image size.
# #
# Please keep these two Dockerfiles in sync. # Please keep these two Dockerfiles in sync.
#
# Only sections different from the root Dockerfile are commented.
EXPOSE 4001 EXPOSE 4001

2
test/3nodetest/Makefile
View File

@ -25,7 +25,7 @@ bin/random: $(RANDOMSRC)/**/*.go
# just build it every time... this part isn't # just build it every time... this part isn't
# even the lengthy part, and it decreases pain. # even the lengthy part, and it decreases pain.
docker_ipfs_image: docker_ipfs_image:
docker build -t $(IMAGE_NAME) -f test/Dockerfile . docker build -t $(IMAGE_NAME) -f Dockerfile.fast .
docker images | grep $(IMAGE_NAME) docker images | grep $(IMAGE_NAME)
clean: clean:

2
test/sharness/t0300-docker-image.sh
View File

@ -33,7 +33,7 @@ TEST_TESTS_DIR=$(dirname "$TEST_SCRIPTS_DIR")
APP_ROOT_DIR=$(dirname "$TEST_TESTS_DIR") APP_ROOT_DIR=$(dirname "$TEST_TESTS_DIR")
test_expect_success "docker image build succeeds" ' test_expect_success "docker image build succeeds" '
docker_build "$TEST_TESTS_DIR/Dockerfile" "$APP_ROOT_DIR" >actual || docker_build "$TEST_TESTS_DIR/../Dockerfile.fast" "$APP_ROOT_DIR" >actual ||
test_fsh echo "TEST_TESTS_DIR: $TEST_TESTS_DIR" || test_fsh echo "TEST_TESTS_DIR: $TEST_TESTS_DIR" ||
test_fsh echo "APP_ROOT_DIR : $APP_ROOT_DIR" || test_fsh echo "APP_ROOT_DIR : $APP_ROOT_DIR" ||
test_fsh cat actual test_fsh cat actual