Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ jobs:
- name: Log versions
run: |
echo "Docker client version: ${{ steps.docker.outputs.docker-client-version }}"
echo "Docker compose version: ${{ steps.docker.outputs.docker-compose-version }}"
echo "Docker buildx version: ${{ steps.docker.outputs.docker-buildx-version }}"
echo "Colima version: ${{ steps.docker.outputs.colima-version }}"

test-network-address:
Expand Down Expand Up @@ -139,4 +141,6 @@ jobs:
- name: Log versions
run: |
echo "Docker client version: ${{ steps.docker.outputs.docker-client-version }}"
echo "Docker compose version: ${{ steps.docker.outputs.docker-compose-version }}"
echo "Docker buildx version: ${{ steps.docker.outputs.docker-buildx-version }}"
echo "Colima version: ${{ steps.docker.outputs.colima-version }}"
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning].

## [Unreleased]

### Added

- Install Docker Buildx and configure it as a Docker CLI plugin ([#29](https://github.com/douglascamata/setup-docker-macos-action/issues/29)).
- New `docker-buildx-version` output to expose the installed Docker Buildx version.

### Changed

- Use `brew --prefix <formula>` instead of `$(brew --prefix)/opt/<formula>` for more robust Homebrew path resolution across different macOS architectures and Homebrew layouts.

## [v1.0.2] - 2025-11-10

### Fixed
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@ The version of the Docker client that was installed.

The version of Docker Compose that was installed.

### `docker-buildx-version`

The version of Docker Buildx that was installed.

### Example

```yml
Expand All @@ -98,6 +102,7 @@ The version of Docker Compose that was installed.
echo "Colima version: ${{ steps.setup-docker.outputs.colima-version }}"
echo "Docker client version: ${{ steps.setup-docker.outputs.docker-client-version }}"
echo "Docker compose version: ${{ steps.setup-docker.outputs.docker-compose-version }}"
echo "Docker buildx version: ${{ steps.setup-docker.outputs.docker-buildx-version }}"
```

## Known Issues
Expand Down
21 changes: 16 additions & 5 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ outputs:
docker-compose-version:
value: ${{ steps.docker-compose-version.outputs.version }}
description: Version of Docker Compose
docker-buildx-version:
value: ${{ steps.docker-buildx-version.outputs.version }}
description: Version of Docker Buildx
runs:
using: "composite"
steps:
Expand Down Expand Up @@ -94,20 +97,21 @@ runs:
install colima-$(uname)-$(uname -m) /usr/local/bin/colima
echo "::endgroup::"
shell: bash
- name: Install Docker client, and Docker Compose
- name: Install Docker client, Docker Compose, and Docker Buildx
env:
HOMEBREW_NO_AUTO_UPDATE: "1"
HOMEBREW_NO_INSTALL_UPGRADE: "1"
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: "1"
run: |
echo "::group::Installing Docker client and Docker Compose"
brew install docker docker-compose
echo "::group::Installing Docker client, Docker Compose, and Docker Buildx"
brew install docker docker-compose docker-buildx
echo "::endgroup::"
shell: bash
- name: Configure Docker Compose plugin
- name: Configure Docker CLI plugins
run: |
mkdir -p ~/.docker/cli-plugins
ln -sfn "$(brew --prefix)/opt/docker-compose/bin/docker-compose" ~/.docker/cli-plugins/docker-compose
ln -sfn "$(brew --prefix docker-compose)/bin/docker-compose" ~/.docker/cli-plugins/docker-compose
ln -sfn "$(brew --prefix docker-buildx)/bin/docker-buildx" ~/.docker/cli-plugins/docker-buildx
shell: bash
- name: Start Colima
env:
Expand Down Expand Up @@ -143,6 +147,13 @@ runs:
docker compose version >> "$GITHUB_OUTPUT"
echo "$EOF" >> "$GITHUB_OUTPUT"
shell: bash
- id: docker-buildx-version
run: |
EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
echo "version<<$EOF" >> "$GITHUB_OUTPUT"
docker buildx version >> "$GITHUB_OUTPUT"
echo "$EOF" >> "$GITHUB_OUTPUT"
shell: bash
- id: colima-version
run: |
EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
Expand Down
Loading