From d04d28275a2f6cbc304e8067fb0d693129506200 Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Tue, 27 Aug 2024 10:04:08 -0500 Subject: [PATCH] Standardize on compose.yaml Convert the supported JDK versions to use compose.yaml --- .github/workflows/ci.yml | 10 +++++----- .../{docker-compose.yml => compose.yaml} | 4 ++-- docker/Linux-JDK17/{compose.yml => compose.yaml} | 2 +- docker/Linux-JDK21/{compose.yml => compose.yaml} | 0 docker/Windows-JDK17/{compose.yml => compose.yaml} | 2 +- docker/Windows-JDK21/{compose.yml => compose.yaml} | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) rename docker/Linux-GraalVM20/{docker-compose.yml => compose.yaml} (81%) rename docker/Linux-JDK17/{compose.yml => compose.yaml} (84%) rename docker/Linux-JDK21/{compose.yml => compose.yaml} (100%) rename docker/Windows-JDK17/{compose.yml => compose.yaml} (84%) rename docker/Windows-JDK21/{compose.yml => compose.yaml} (84%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b7f08dd6..f33ec905a 100644 --- 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 b/docker/Linux-GraalVM20/compose.yaml similarity index 81% rename from docker/Linux-GraalVM20/docker-compose.yml rename to docker/Linux-GraalVM20/compose.yaml index be0c9f126..210ac32d4 100644 --- a/docker/Linux-GraalVM20/docker-compose.yml +++ b/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 b/docker/Linux-JDK17/compose.yaml similarity index 84% rename from docker/Linux-JDK17/compose.yml rename to docker/Linux-JDK17/compose.yaml index ff2b1994b..ce0fae178 100644 --- a/docker/Linux-JDK17/compose.yml +++ b/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 b/docker/Linux-JDK21/compose.yaml similarity index 100% rename from docker/Linux-JDK21/compose.yml rename to docker/Linux-JDK21/compose.yaml diff --git a/docker/Windows-JDK17/compose.yml b/docker/Windows-JDK17/compose.yaml similarity index 84% rename from docker/Windows-JDK17/compose.yml rename to docker/Windows-JDK17/compose.yaml index 17d58fa5d..6e44587dd 100644 --- a/docker/Windows-JDK17/compose.yml +++ b/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 b/docker/Windows-JDK21/compose.yaml similarity index 84% rename from docker/Windows-JDK21/compose.yml rename to docker/Windows-JDK21/compose.yaml index 9b286b036..8627e3fb2 100644 --- a/docker/Windows-JDK21/compose.yml +++ b/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: