This is an automated email from the ASF dual-hosted git repository.

kou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-java.git


The following commit(s) were added to refs/heads/main by this push:
     new b32b0c07 GH-535: [Dev] Use `compose.yaml` not `docker-compose.yml` 
(#536)
b32b0c07 is described below

commit b32b0c0750462f49030c78753126f76500300364
Author: Sutou Kouhei <[email protected]>
AuthorDate: Mon Jan 20 11:39:13 2025 +0900

    GH-535: [Dev] Use `compose.yaml` not `docker-compose.yml` (#536)
    
    Fixes GH-535.
    
    Because Docker Compose recommends `compose.yaml`:
    
    
    
https://docs.docker.com/compose/intro/compose-application-model/#the-compose-file
    
    > The default path for a Compose file is compose.yaml (preferred) or
    > compose.yml that is placed in the working directory. Compose also
    > supports docker-compose.yaml and docker-compose.yml for backwards
    > compatibility of earlier versions. If both files exist, Compose
    > prefers the canonical compose.yaml.
---
 .github/workflows/test.yml         | 2 +-
 docker-compose.yml => compose.yaml | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7841dd89..a9ed7eb6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -66,7 +66,7 @@ jobs:
         uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
         with:
           path: .docker
-          key: maven-${{ matrix.jdk }}-${{ matrix.maven }}-${{ 
hashFiles('**/docker-compose.yml', '**/pom.xml') }}
+          key: maven-${{ matrix.jdk }}-${{ matrix.maven }}-${{ 
hashFiles('**/compose.yaml', '**/pom.xml') }}
           restore-keys: maven-${{ matrix.jdk }}-${{ matrix.maven }}-
       - name: Execute Docker Build
         env:
diff --git a/docker-compose.yml b/compose.yaml
similarity index 100%
rename from docker-compose.yml
rename to compose.yaml

Reply via email to