Merge pull request #696 from cantaloupe-project/yaml

Standardize on compose.yaml
cantaloupe-project · Aug 28, 2024 · c351b60 · c351b60
2 parents d7a833d + 1ededb4
commit c351b60
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,26 +21,26 @@ jobs:
         run: docker compose -f docker/Linux-JDK11/docker-compose.yml up --build --exit-code-from cantaloupe
       - name: Test in Linux JDK 17 (LTS)
         if: matrix.os == 'ubuntu-latest' && matrix.java == 'jdk17'
-        run: docker compose -f docker/Linux-JDK17/compose.yml up --build --exit-code-from cantaloupe
+        run: docker compose -f docker/Linux-JDK17/compose.yaml up --build --exit-code-from cantaloupe
       - name: Test in Linux JDK 18
         if: matrix.os == 'ubuntu-latest' && matrix.java == 'jdk18'
         run: docker compose -f docker/Linux-JDK18/docker-compose.yml up --build --exit-code-from cantaloupe
       - name: Test in Linux JDK 21 (LTS)
         if: matrix.os == 'ubuntu-latest' && matrix.java == 'jdk21'
-        run: docker compose -f docker/Linux-JDK21/compose.yml up --build --exit-code-from cantaloupe
+        run: docker compose -f docker/Linux-JDK21/compose.yaml up --build --exit-code-from cantaloupe
       - name: Test in Linux GraalVM
         if: matrix.os == 'ubuntu-latest' && matrix.java == 'graalvm'
-        run: docker compose -f docker/Linux-GraalVM20/docker-compose.yml up --build --exit-code-from cantaloupe
+        run: docker compose -f docker/Linux-GraalVM20/compose.yaml up --build --exit-code-from cantaloupe
       - name: Test in Windows JDK 11
         if: matrix.os == 'windows-latest' && matrix.java == 'jdk11'
         run: docker compose -f docker/Windows-JDK11/docker-compose.yml up --build --exit-code-from cantaloupe
       - name: Test in Windows JDK 17 (LTS)
         if: matrix.os == 'windows-latest' && matrix.java == 'jdk17'
-        run: docker compose -f docker/Windows-JDK17/compose.yml up --build --exit-code-from cantaloupe
+        run: docker compose -f docker/Windows-JDK17/compose.yaml up --build --exit-code-from cantaloupe
       - name: Test in Windows JDK 18
         if: matrix.os == 'windows-latest' && matrix.java == 'jdk18'
         run: docker compose -f docker/Windows-JDK18/docker-compose.yml up --build --exit-code-from cantaloupe
       - name: Test in Windows JDK 21 (LTS)
         if: matrix.os == 'windows-latest' && matrix.java == 'jdk21'
-        run: docker compose -f docker/Windows-JDK21/compose.yml up --build --exit-code-from cantaloupe
+        run: docker compose -f docker/Windows-JDK21/compose.yaml up --build --exit-code-from cantaloupe
       # TODO: Windows+GraalVM
diff --git a/docker/Linux-GraalVM20/docker-compose.yml → docker/Linux-GraalVM20/compose.yaml b/docker/Linux-GraalVM20/docker-compose.yml → docker/Linux-GraalVM20/compose.yaml
@@ -1,9 +1,9 @@
 #
 # N.B.: docker-compose must be invoked from the project root directory:
 #
-# docker-compose -f path/to/docker-compose.yml up --exit-code-from cantaloupe
+# docker compose -f path/to/compose.yaml up --exit-code-from cantaloupe
 #
-version: '3'
+version: "3"
 services:
   cantaloupe:
     build:

diff --git a/docker/Linux-JDK17/compose.yml → docker/Linux-JDK17/compose.yaml b/docker/Linux-JDK17/compose.yml → docker/Linux-JDK17/compose.yaml
@@ -1,7 +1,7 @@
 #
 # N.B.: docker compose must be invoked from the project root directory:
 #
-# docker compose -f path/to/compose.yml up --exit-code-from cantaloupe
+# docker compose -f path/to/compose.yaml up --exit-code-from cantaloupe
 #
 services:
   cantaloupe:

diff --git a/docker/Linux-JDK21/compose.yml → docker/Linux-JDK21/compose.yaml b/docker/Linux-JDK21/compose.yml → docker/Linux-JDK21/compose.yaml
diff --git a/docker/Windows-JDK17/compose.yml → docker/Windows-JDK17/compose.yaml b/docker/Windows-JDK17/compose.yml → docker/Windows-JDK17/compose.yaml
@@ -1,7 +1,7 @@
 #
 # N.B.: docker-compose must be invoked from the project root directory:
 #
-# docker compose -f path/to/compose.yml up --exit-code-from cantaloupe
+# docker compose -f path/to/compose.yaml up --exit-code-from cantaloupe
 #
 services:
   cantaloupe:

diff --git a/docker/Windows-JDK21/compose.yml → docker/Windows-JDK21/compose.yaml b/docker/Windows-JDK21/compose.yml → docker/Windows-JDK21/compose.yaml
@@ -1,7 +1,7 @@
 #
 # N.B.: docker-compose must be invoked from the project root directory:
 #
-# docker compose -f path/to/compose.yml up --exit-code-from cantaloupe
+# docker compose -f path/to/compose.yaml up --exit-code-from cantaloupe
 #
 services:
   cantaloupe: