From e9d7212192350f443058516d8ee54c0fd1b927f8 Mon Sep 17 00:00:00 2001 From: Caleb Schilly Date: Wed, 18 Sep 2024 09:42:59 -0400 Subject: [PATCH] #363: complete transition from docker-compose to docker compose --- .github/workflows/dockerimage-clang-10-ubuntu-mpich.yml | 2 +- .github/workflows/dockerimage-clang-11-ubuntu-mpich-vt.yml | 2 +- .github/workflows/dockerimage-clang-11-ubuntu-mpich.yml | 2 +- .github/workflows/dockerimage-clang-12-ubuntu-mpich.yml | 2 +- .github/workflows/dockerimage-clang-13-ubuntu-mpich.yml | 2 +- .github/workflows/dockerimage-clang-14-ubuntu-mpich.yml | 2 +- .github/workflows/dockerimage-clang-8-ubuntu-mpich.yml | 2 +- .github/workflows/dockerimage-clang-9-ubuntu-mpich.yml | 2 +- .github/workflows/dockerimage-gcc-10-ubuntu-mpich.yml | 2 +- .github/workflows/dockerimage-gcc-8-ubuntu-mpich.yml | 2 +- .github/workflows/dockerimage-gcc-9-ubuntu-mpich.yml | 2 +- .github/workflows/dockerimage-nvcc-11-ubuntu-mpich.yml | 2 +- scripts/check_containers.sh | 4 ++-- scripts/workflow-template.yml | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/dockerimage-clang-10-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-10-ubuntu-mpich.yml index b326ade4..92ed3dfd 100644 --- a/.github/workflows/dockerimage-clang-10-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-clang-10-ubuntu-mpich.yml @@ -68,7 +68,7 @@ jobs: run: | docker login -u ${{ secrets.DOCKER_USERNAME }} \ -p ${{ secrets.DOCKER_PASSWORD }} - docker-compose push ubuntu-cpp + docker compose push ubuntu-cpp - name: Zip up CMake output run: | zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log diff --git a/.github/workflows/dockerimage-clang-11-ubuntu-mpich-vt.yml b/.github/workflows/dockerimage-clang-11-ubuntu-mpich-vt.yml index e33dde93..879ac2e4 100644 --- a/.github/workflows/dockerimage-clang-11-ubuntu-mpich-vt.yml +++ b/.github/workflows/dockerimage-clang-11-ubuntu-mpich-vt.yml @@ -68,4 +68,4 @@ jobs: run: | docker login -u ${{ secrets.DOCKER_USERNAME }} \ -p ${{ secrets.DOCKER_PASSWORD }} - docker-compose push ubuntu-cpp-vt + docker compose push ubuntu-cpp-vt diff --git a/.github/workflows/dockerimage-clang-11-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-11-ubuntu-mpich.yml index 1c41113b..fafafa6c 100644 --- a/.github/workflows/dockerimage-clang-11-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-clang-11-ubuntu-mpich.yml @@ -68,7 +68,7 @@ jobs: run: | docker login -u ${{ secrets.DOCKER_USERNAME }} \ -p ${{ secrets.DOCKER_PASSWORD }} - docker-compose push ubuntu-cpp + docker compose push ubuntu-cpp - name: Zip up CMake output run: | zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log diff --git a/.github/workflows/dockerimage-clang-12-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-12-ubuntu-mpich.yml index 31466b24..a7c66bc2 100644 --- a/.github/workflows/dockerimage-clang-12-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-clang-12-ubuntu-mpich.yml @@ -68,7 +68,7 @@ jobs: run: | docker login -u ${{ secrets.DOCKER_USERNAME }} \ -p ${{ secrets.DOCKER_PASSWORD }} - docker-compose push ubuntu-cpp + docker compose push ubuntu-cpp - name: Zip up CMake output run: | zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log diff --git a/.github/workflows/dockerimage-clang-13-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-13-ubuntu-mpich.yml index 8c975d77..c7dd6436 100644 --- a/.github/workflows/dockerimage-clang-13-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-clang-13-ubuntu-mpich.yml @@ -68,7 +68,7 @@ jobs: run: | docker login -u ${{ secrets.DOCKER_USERNAME }} \ -p ${{ secrets.DOCKER_PASSWORD }} - docker-compose push ubuntu-cpp + docker compose push ubuntu-cpp - name: Zip up CMake output run: | zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log diff --git a/.github/workflows/dockerimage-clang-14-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-14-ubuntu-mpich.yml index cd10b76e..027d8d67 100644 --- a/.github/workflows/dockerimage-clang-14-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-clang-14-ubuntu-mpich.yml @@ -68,7 +68,7 @@ jobs: run: | docker login -u ${{ secrets.DOCKER_USERNAME }} \ -p ${{ secrets.DOCKER_PASSWORD }} - docker-compose push ubuntu-cpp + docker compose push ubuntu-cpp - name: Zip up CMake output run: | zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log diff --git a/.github/workflows/dockerimage-clang-8-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-8-ubuntu-mpich.yml index c728914e..646f3c3c 100644 --- a/.github/workflows/dockerimage-clang-8-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-clang-8-ubuntu-mpich.yml @@ -68,7 +68,7 @@ jobs: run: | docker login -u ${{ secrets.DOCKER_USERNAME }} \ -p ${{ secrets.DOCKER_PASSWORD }} - docker-compose push ubuntu-cpp + docker compose push ubuntu-cpp - name: Zip up CMake output run: | zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log diff --git a/.github/workflows/dockerimage-clang-9-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-9-ubuntu-mpich.yml index 6e7684a2..c1496111 100644 --- a/.github/workflows/dockerimage-clang-9-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-clang-9-ubuntu-mpich.yml @@ -68,7 +68,7 @@ jobs: run: | docker login -u ${{ secrets.DOCKER_USERNAME }} \ -p ${{ secrets.DOCKER_PASSWORD }} - docker-compose push ubuntu-cpp + docker compose push ubuntu-cpp - name: Zip up CMake output run: | zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log diff --git a/.github/workflows/dockerimage-gcc-10-ubuntu-mpich.yml b/.github/workflows/dockerimage-gcc-10-ubuntu-mpich.yml index 7a753bfa..03c54cad 100644 --- a/.github/workflows/dockerimage-gcc-10-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-gcc-10-ubuntu-mpich.yml @@ -68,7 +68,7 @@ jobs: run: | docker login -u ${{ secrets.DOCKER_USERNAME }} \ -p ${{ secrets.DOCKER_PASSWORD }} - docker-compose push ubuntu-cpp + docker compose push ubuntu-cpp - name: Zip up CMake output run: | zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log diff --git a/.github/workflows/dockerimage-gcc-8-ubuntu-mpich.yml b/.github/workflows/dockerimage-gcc-8-ubuntu-mpich.yml index 0cdda6c6..546543d6 100644 --- a/.github/workflows/dockerimage-gcc-8-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-gcc-8-ubuntu-mpich.yml @@ -68,7 +68,7 @@ jobs: run: | docker login -u ${{ secrets.DOCKER_USERNAME }} \ -p ${{ secrets.DOCKER_PASSWORD }} - docker-compose push ubuntu-cpp + docker compose push ubuntu-cpp - name: Zip up CMake output run: | zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log diff --git a/.github/workflows/dockerimage-gcc-9-ubuntu-mpich.yml b/.github/workflows/dockerimage-gcc-9-ubuntu-mpich.yml index e010764a..8aef669e 100644 --- a/.github/workflows/dockerimage-gcc-9-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-gcc-9-ubuntu-mpich.yml @@ -68,7 +68,7 @@ jobs: run: | docker login -u ${{ secrets.DOCKER_USERNAME }} \ -p ${{ secrets.DOCKER_PASSWORD }} - docker-compose push ubuntu-cpp + docker compose push ubuntu-cpp - name: Zip up CMake output run: | zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log diff --git a/.github/workflows/dockerimage-nvcc-11-ubuntu-mpich.yml b/.github/workflows/dockerimage-nvcc-11-ubuntu-mpich.yml index 3bb545cf..f700d39f 100644 --- a/.github/workflows/dockerimage-nvcc-11-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-nvcc-11-ubuntu-mpich.yml @@ -68,7 +68,7 @@ jobs: run: | docker login -u ${{ secrets.DOCKER_USERNAME }} \ -p ${{ secrets.DOCKER_PASSWORD }} - docker-compose push ubuntu-cpp + docker compose push ubuntu-cpp - name: Zip up CMake output run: | zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log diff --git a/scripts/check_containers.sh b/scripts/check_containers.sh index 803ac823..2bd8fb9c 100755 --- a/scripts/check_containers.sh +++ b/scripts/check_containers.sh @@ -18,7 +18,7 @@ diff_latest() { # Print the modified files list to stderr as well. if diff_latest | tee >(cat >&2) | grep -i -q dockerfile then - echo "docker-compose build --pull" + echo "docker compose build --pull" else - echo "docker-compose pull --ignore-pull-failures" + echo "docker compose pull --ignore-pull-failures" fi diff --git a/scripts/workflow-template.yml b/scripts/workflow-template.yml index 68e99073..b274a8dd 100644 --- a/scripts/workflow-template.yml +++ b/scripts/workflow-template.yml @@ -61,7 +61,7 @@ jobs: run: | docker login -u ${{ secrets.DOCKER_USERNAME }} \ -p ${{ secrets.DOCKER_PASSWORD }} - docker-compose push [% docker_target %] + docker compose push [% docker_target %] - name: Zip up CMake output run: | zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log