opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-29 17:36:38 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2937 from ipfs/feature/docker-dev-suffix

Browse Source 
docker: take -dev version suffix into account
This commit is contained in:
Jeromy Johnson
2016-07-02 19:42:02 -07:00
committed by GitHub
parent 4fa85cc4d4 afda38f201
commit 50a7df6c8e
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/Makefile
View File

@ -7,7 +7,7 @@ RANDOM_FILES_SRC = ../Godeps/_workspace/src/github.com/jbenet/go-random-files
POLLENDPOINT_SRC= ../thirdparty/pollEndpoint POLLENDPOINT_SRC= ../thirdparty/pollEndpoint
GOSLEEP_SRC = ./dependencies/go-sleep GOSLEEP_SRC = ./dependencies/go-sleep
GX_RELATIVE_PATH = ../../../../gx/ipfs GX_RELATIVE_PATH = gx/ipfs
export PATH := ../bin:${PATH} export PATH := ../bin:${PATH}

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

@ -66,13 +66,16 @@ test_expect_success "simple ipfs add/cat can be run in docker container" '
test_cmp expected actual test_cmp expected actual
' '
test_expect_success "version CurrentCommit is set" ' read testcode <<EOF
docker_exec "$DOC_ID" "wget --retry-connrefused --waitretry=1 --timeout=30 -t 30 \ docker exec -i "$DOC_ID" wget --retry-connrefused --waitretry=1 --timeout=30 -t 30 \
-q -O - http://localhost:8080/version" | grep Commit | cut -d" " -f2 >actual && -q -O - http://localhost:8080/version | grep Commit | cut -d" " -f2 >actual ; \
docker_exec "$DOC_ID" "ipfs version --commit" | cut -d- -f2 >expected && test -s actual ; \
test -s expected && # check there actually is a commit set docker exec -i "$DOC_ID" ipfs version --enc json \
| sed 's/^.*"Commit":"\\\([^"]*\\\)".*$/\\\1/g' >expected ; \
test -s expected ; \
test_cmp expected actual test_cmp expected actual
' EOF
test_expect_success "version CurrentCommit is set" "$testcode"
test_expect_success "stop docker container" ' test_expect_success "stop docker container" '
docker_stop "$DOC_ID" docker_stop "$DOC_ID"