Merge pull request #569 from thockin/v3_e2e_CLEANUP_docker_rm
v3: e2e: $CLEANUP decides whether to rm containers
This commit is contained in:
commit
25b93107c5
12
test_e2e.sh
12
test_e2e.sh
|
|
@ -73,9 +73,13 @@ function assert_file_contains() {
|
||||||
|
|
||||||
# Helper: run a docker container.
|
# Helper: run a docker container.
|
||||||
function docker_run() {
|
function docker_run() {
|
||||||
|
RM="--rm"
|
||||||
|
if [[ "${CLEANUP:-}" == 0 ]]; then
|
||||||
|
RM=""
|
||||||
|
fi
|
||||||
docker run \
|
docker run \
|
||||||
-d \
|
-d \
|
||||||
--rm \
|
${RM} \
|
||||||
--label git-sync-e2e="$RUNID" \
|
--label git-sync-e2e="$RUNID" \
|
||||||
"$@"
|
"$@"
|
||||||
sleep 2 # wait for it to come up
|
sleep 2 # wait for it to come up
|
||||||
|
|
@ -158,9 +162,13 @@ touch $RUNLOG
|
||||||
|
|
||||||
function GIT_SYNC() {
|
function GIT_SYNC() {
|
||||||
#./bin/linux_amd64/git-sync "$@"
|
#./bin/linux_amd64/git-sync "$@"
|
||||||
|
RM="--rm"
|
||||||
|
if [[ "${CLEANUP:-}" == 0 ]]; then
|
||||||
|
RM=""
|
||||||
|
fi
|
||||||
docker run \
|
docker run \
|
||||||
-i \
|
-i \
|
||||||
--rm \
|
${RM} \
|
||||||
--label git-sync-e2e="$RUNID" \
|
--label git-sync-e2e="$RUNID" \
|
||||||
--network="host" \
|
--network="host" \
|
||||||
-u $(id -u):$(id -g) \
|
-u $(id -u):$(id -g) \
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue