Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Standardize on compose.yaml #696

Merged
merged 2 commits into from
Aug 28, 2024
Merged

Standardize on compose.yaml #696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d04d282
Standardize on compose.yaml
jcoyne Aug 27, 2024
1ededb4
Merge branch 'develop' into yaml
glenrobson Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions docker/Linux-GraalVM20/docker-compose.yml → docker/Linux-GraalVM20/compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docker/Linux-JDK17/compose.yml → docker/Linux-JDK17/compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
0 docker/Linux-JDK21/compose.yml → docker/Linux-JDK21/compose.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion docker/Windows-JDK17/compose.yml → docker/Windows-JDK17/compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docker/Windows-JDK21/compose.yml → docker/Windows-JDK21/compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down