Skip to content

Commit fbf68ab

Browse files
committed
Use new version of docker compose (as a plugin)
1 parent 94648d7 commit fbf68ab

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

test.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source ./assert.sh
22
set -e
33

4-
trap 'docker-compose stop -t 1' EXIT INT
4+
trap 'docker compose stop -t 1' EXIT INT
55

66
test_suite() {
77
image_name=$1
@@ -10,11 +10,11 @@ test_suite() {
1010
echo
1111

1212
set -x
13-
docker-compose rm --force --stop test-$image_name || true
13+
docker compose rm --force --stop test-$image_name || true
1414

15-
docker-compose up -d test-$image_name
16-
docker cp zsh-in-docker.sh zsh-in-docker_test-${image_name}_1:/tmp
17-
docker exec zsh-in-docker_test-${image_name}_1 sh /tmp/zsh-in-docker.sh \
15+
docker compose up -d test-$image_name
16+
docker cp zsh-in-docker.sh zsh-in-docker-test-${image_name}-1:/tmp
17+
docker exec zsh-in-docker-test-${image_name}-1 sh /tmp/zsh-in-docker.sh \
1818
-t https://github.com/denysdovhan/spaceship-prompt \
1919
-p git -p git-auto-fetch \
2020
-p https://github.com/zsh-users/zsh-autosuggestions \
@@ -24,8 +24,8 @@ test_suite() {
2424
set +x
2525

2626
echo
27-
VERSION=$(docker exec zsh-in-docker_test-${image_name}_1 zsh --version)
28-
ZSHRC=$(docker exec zsh-in-docker_test-${image_name}_1 cat /root/.zshrc)
27+
VERSION=$(docker exec zsh-in-docker-test-${image_name}-1 zsh --version)
28+
ZSHRC=$(docker exec zsh-in-docker-test-${image_name}-1 cat /root/.zshrc)
2929
echo "########################################################################################"
3030
echo "$ZSHRC"
3131
echo "########################################################################################"
@@ -40,7 +40,7 @@ test_suite() {
4040
echo
4141
echo "######### Success! All tests are passing for ${image_name}"
4242

43-
docker-compose stop -t 1 test-$image_name
43+
docker compose stop -t 1 test-$image_name
4444
}
4545

4646
images=${*:-"alpine ubuntu ubuntu-14.04 debian amazonlinux"}

0 commit comments

Comments
 (0)