[CALCITE-6359] Update GitHub Actions workflows to use docker compose v2

apache · Apr 10, 2024 · 0a7fffe · 0a7fffe
1 parent 7bd1877
commit 0a7fffe
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/publish-non-release-website-updates.yml b/.github/workflows/publish-non-release-website-updates.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Build site
         working-directory: site
         run: |
-          docker-compose run -e JEKYLL_UID=$(id -u) -e JEKYLL_GID=$(id -g) build-site
+          docker compose run -e JEKYLL_UID=$(id -u) -e JEKYLL_GID=$(id -g) build-site
       - uses: actions/checkout@v3
         with:
           repository: apache/calcite-site

diff --git a/.github/workflows/publish-site-and-javadocs-on-release.yml b/.github/workflows/publish-site-and-javadocs-on-release.yml
@@ -29,11 +29,11 @@ jobs:
       - name: Build site
         working-directory: site
         run: |
-          docker-compose run -e JEKYLL_UID=$(id -u) -e JEKYLL_GID=$(id -g) build-site
+          docker compose run -e JEKYLL_UID=$(id -u) -e JEKYLL_GID=$(id -g) build-site
       - name: Build javadoc
         working-directory: site
         run: |
-          docker-compose run generate-javadoc
+          docker compose run generate-javadoc
       - uses: actions/checkout@v3
         with:
           repository: apache/calcite-site

diff --git a/site/_docs/howto.md b/site/_docs/howto.md
@@ -91,7 +91,7 @@ Prerequisites are [Docker](https://docs.docker.com/install/) and
 [Docker Compose](https://docs.docker.com/compose/install/).
 
 {% highlight bash %}
-docker-compose run test
+docker compose run test
 {% endhighlight %}
 
 ## Contributing
@@ -255,16 +255,16 @@ the script will make a copy of the contents and move it to a different location,
 
 {% highlight bash %}
 # On Linux (dry-run):
-docker-compose run -v ~/.gnupg:/.gnupg dry-run
+docker compose run -v ~/.gnupg:/.gnupg dry-run
 
 # On Windows (dry-run):
-docker-compose run -v /c/Users/username/AppData/Roaming/gnupg:/.gnupg dry-run
+docker compose run -v /c/Users/username/AppData/Roaming/gnupg:/.gnupg dry-run
 
 # On Linux (push to ASF servers):
-docker-compose run -v ~/.gnupg:/.gnupg publish-release-for-voting
+docker compose run -v ~/.gnupg:/.gnupg publish-release-for-voting
 
 # On Windows (push to ASF servers):
-docker-compose run -v /c/Users/username/AppData/Roaming/gnupg:/.gnupg publish-release-for-voting
+docker compose run -v /c/Users/username/AppData/Roaming/gnupg:/.gnupg publish-release-for-voting
 {% endhighlight %}
 
 ## Checking the artifacts
@@ -473,7 +473,7 @@ The old releases will remain available in the
 This assumes that a rc release was tagged and pushed to the git repository.
 
 {% highlight bash %}
-docker-compose run promote-release
+docker compose run promote-release
 {% endhighlight %}
 
 ## Add release notes and announce the release