summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2016-11-28 17:22:24 +0000
committerAtomic Bot <atomic-devel@projectatomic.io>2016-11-29 14:11:50 +0000
commit49b8ccd8cbfe4a09ee09b85b410bfd8f3e5d1b06 (patch)
treea94bc775a974dc406572e7542fcee2ca43091d47
parent0473fb852360c3378585861e79fc43897df271db (diff)
downloadostree-49b8ccd8cbfe4a09ee09b85b410bfd8f3e5d1b06.tar.gz
travis-ci: Use a non-ostree-specific name for the Docker image
This reduces the diff when comparing these scripts with similar glue in dbus or elsewhere. Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Closes: #600 Approved by: cgwalters
-rwxr-xr-xtests/ci-build.sh2
-rwxr-xr-xtests/ci-install.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/ci-build.sh b/tests/ci-build.sh
index eb6bc678..42c2dcff 100755
--- a/tests/ci-build.sh
+++ b/tests/ci-build.sh
@@ -40,7 +40,7 @@ if [ -n "$ci_docker" ]; then
--env=ci_test="${ci_test}" \
--env=ci_test_fatal="${ci_test_fatal}" \
--privileged \
- ostree-ci \
+ ci-image \
tests/ci-build.sh
fi
diff --git a/tests/ci-install.sh b/tests/ci-install.sh
index fb982dff..1b52704c 100755
--- a/tests/ci-install.sh
+++ b/tests/ci-install.sh
@@ -43,7 +43,7 @@ if [ -n "$ci_docker" ]; then
-e "s/@ci_docker@/${ci_docker}/" \
-e "s/@ci_suite@/${ci_suite}/" \
< tests/ci-Dockerfile.in > Dockerfile
- exec docker build -t ostree-ci .
+ exec docker build -t ci-image .
fi
case "$ci_distro" in