Skip to content
This repository was archived by the owner on May 4, 2021. It is now read-only.

Commit 77a526a

Browse files
committed
Merge pull request #49 from tutumcloud/staging
v0.16.20
2 parents 741ef7e + 24e1eba commit 77a526a

File tree

2 files changed

+21
-10
lines changed

2 files changed

+21
-10
lines changed

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ A docker image that builds, tests and pushes docker images from code repositorie
1010

1111
Run the following docker command in the folder that you want to build and push:
1212

13-
docker run --rm -it --privileged -v $(pwd):/app -v $HOME/.dockercfg:/.dockercfg:r tutum/builder $IMAGE_NAME
13+
docker run --rm -it --privileged -v $(pwd):/app -v $HOME/.dockercfg:/.dockercfg:ro tutum/builder $IMAGE_NAME
1414

1515
Where:
1616

@@ -70,8 +70,6 @@ Example `docker-compose.test.yml` file for a Django app that depends on a Redis
7070
environment:
7171
- REDIS_PASS=password
7272

73-
To speed up testing, you can replace `build: .` in your `sut` service with `image: this`, which is the name of the image that is built just before running the tests. This way you can avoid building the same image twice.
74-
7573

7674
# Hooks
7775

build.sh

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,21 @@ run_hook() {
1515
fi
1616
}
1717

18+
run_docker() {
19+
echo "=> Starting docker"
20+
wrapdocker > /dev/null 2>&1 &
21+
echo "=> Checking docker daemon"
22+
LOOP_LIMIT=60
23+
for (( i=0; ; i++ )); do
24+
if [ ${i} -eq ${LOOP_LIMIT} ]; then
25+
echo " Failed to start docker (did you use --privileged when running this container?"
26+
exit 1
27+
fi
28+
sleep 1
29+
docker version > /dev/null 2>&1 && break
30+
done
31+
}
32+
1833
EXTERNAL_DOCKER=no
1934
MOUNTED_DOCKER_FOLDER=no
2035
if [ -S /var/run/docker.sock ]; then
@@ -27,18 +42,14 @@ if [ -S /var/run/docker.sock ]; then
2742
curl -o /usr/bin/docker https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}
2843
fi
2944
fi
30-
docker version > /dev/null 2>&1 || (echo " Failed to connect to docker daemon at /var/run/docker.sock" && exit 1)
45+
docker version > /dev/null 2>&1 || { echo " Failed to connect to docker daemon at /var/run/docker.sock" && exit 1; }
3146
EXTERNAL_DOCKER=yes
3247
else
3348
if [ "$(ls -A /var/lib/docker)" ]; then
3449
echo "=> Detected pre-existing /var/lib/docker folder"
3550
MOUNTED_DOCKER_FOLDER=yes
3651
fi
37-
echo "=> Starting docker"
38-
wrapdocker > /dev/null 2>&1 &
39-
sleep 10
40-
echo "=> Checking docker daemon"
41-
docker version > /dev/null 2>&1 || (echo " Failed to start docker (did you use --privileged when running this container?)" && exit 1)
52+
run_docker
4253
fi
4354

4455
echo "=> Loading docker auth configuration"
@@ -71,6 +82,7 @@ if [ ! -d /app ]; then
7182
cd /src
7283
git checkout $GIT_TAG
7384
export GIT_SHA1=$(git rev-list $GIT_TAG | head -n 1)
85+
export GIT_MSG=$(git log --format=%B -n 1 $GIT_SHA1)
7486
elif [ ! -z "$TGZ_URL" ]; then
7587
echo " Downloading $TGZ_URL"
7688
curl -sL $TGZ_URL | tar zx -C /src
@@ -123,7 +135,8 @@ else
123135
rm -f /root/.dockercfg
124136
fi
125137

126-
docker-compose -f ${TEST_FILENAME} -p $PROJECT_NAME up sut
138+
docker-compose -f ${TEST_FILENAME} -p $PROJECT_NAME up -d sut
139+
docker logs -f ${PROJECT_NAME}_sut_1
127140
RET=$(docker wait ${PROJECT_NAME}_sut_1)
128141
docker-compose -f ${TEST_FILENAME} -p $PROJECT_NAME kill
129142
docker-compose -f ${TEST_FILENAME} -p $PROJECT_NAME rm --force -v

0 commit comments

Comments
 (0)