#363: complete transition from docker-compose to docker compose

DARMA-tasking · Sep 18, 2024 · e9d7212 · e9d7212
1 parent 33b5a21
commit e9d7212
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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