Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docker: make dockerfile differences more obvious #2796

Merged
merged 1 commit into from
Jun 3, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM alpine:3.3
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.
#
# Please keep these two Dockerfiles in sync.
Expand Down
4 changes: 1 addition & 3 deletions test/Dockerfile → Dockerfile.fast
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
FROM alpine:3.3
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.
#
# Please keep these two Dockerfiles in sync.
#
# Only sections different from the root Dockerfile are commented.


EXPOSE 4001
Expand Down
2 changes: 1 addition & 1 deletion test/3nodetest/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ bin/random: $(RANDOMSRC)/**/*.go
# just build it every time... this part isn't
# even the lengthy part, and it decreases pain.
docker_ipfs_image:
docker build -t $(IMAGE_NAME) -f test/Dockerfile .
docker build -t $(IMAGE_NAME) -f Dockerfile.fast .
docker images | grep $(IMAGE_NAME)

clean:
Expand Down
2 changes: 1 addition & 1 deletion test/sharness/t0300-docker-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ TEST_TESTS_DIR=$(dirname "$TEST_SCRIPTS_DIR")
APP_ROOT_DIR=$(dirname "$TEST_TESTS_DIR")

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 "APP_ROOT_DIR : $APP_ROOT_DIR" ||
test_fsh cat actual
Expand Down