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
8 changes: 6 additions & 2 deletions .github/workflows/build-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ jobs:
tag: ($ver + (if (.suffix // "") == "" then "" else "-" + .suffix end)),
context: $ctx,
target: .target,
build_args: ((.args // {}) | to_entries | map(.key + "=" + (.value | tostring)) | join("\n"))
build_args: ((.args // {}) | to_entries | map(.key + "=" + (.value | tostring)) | join("\n")),
platforms: (.platforms // "linux/amd64")
}
' <<< "$entries")
done
Expand All @@ -158,6 +159,9 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
Comment thread
coderabbitai[bot] marked this conversation as resolved.

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

Expand All @@ -173,7 +177,7 @@ jobs:
context: ./${{ matrix.build.context }}
target: ${{ matrix.build.target }}
build-args: ${{ matrix.build.build_args }}
platforms: linux/amd64
platforms: ${{ matrix.build.platforms }}
push: true
tags: devitools/${{ matrix.build.image }}:${{ matrix.build.tag }}
cache-from: type=gha,scope=${{ matrix.build.image }}-${{ matrix.build.tag }}
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,18 @@ jobs:
errors=$((errors+1))
fi

bad_platforms=$(jq -c '[.[] | select(
has("platforms") and (
(.platforms | type) != "string" or
(.platforms | length) == 0
)
)]' <<< "$entries")
if [ "$(jq 'length' <<< "$bad_platforms")" != "0" ]; then
echo "::error file=${manifest}::'platforms' must be a non-empty string when present (e.g. 'linux/amd64' or 'linux/amd64,linux/arm64'):"
jq -r '.[] | " - " + (. | tostring)' <<< "$bad_platforms"
errors=$((errors+1))
fi

if [ ! -f "$dockerfile" ]; then
echo "::error file=${manifest}::sibling Dockerfile not found at ${dockerfile}"
errors=$((errors+1))
Expand Down
5 changes: 5 additions & 0 deletions php-hyperf/8.3/variants.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
target: hyperf
args:
APP_TARGET: dev
- suffix: arm-dev
target: hyperf
args:
APP_TARGET: dev
platforms: linux/arm64
- suffix: otel
target: hyperf-otel
args:
Expand Down
Loading