Skip to content

Commit 06b4d5e

Browse files
committed
Replace docker-build.yaml with ARM64-only workflow, update sync to preserve custom workflow
1 parent e2cbfda commit 06b4d5e

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed
Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Create and publish Docker images with specific build args
1+
name: Build ARM64 Docker Image
22

33
on:
44
workflow_dispatch:
@@ -13,15 +13,13 @@ env:
1313
REGISTRY: ghcr.io
1414

1515
jobs:
16-
build-main-image:
16+
build-arm64-image:
1717
runs-on: ubuntu-24.04-arm
1818
permissions:
1919
contents: read
2020
packages: write
2121

2222
steps:
23-
# GitHub Packages requires the entire repository name to be in lowercase
24-
# although the repository owner has a lowercase username, this prevents some people from running actions after forking
2523
- name: Set repository and image name to lowercase
2624
run: |
2725
echo "IMAGE_NAME=${IMAGE_NAME,,}" >>${GITHUB_ENV}
@@ -45,7 +43,7 @@ jobs:
4543
username: ${{ github.actor }}
4644
password: ${{ secrets.GITHUB_TOKEN }}
4745

48-
- name: Extract metadata for Docker images (default latest tag)
46+
- name: Extract metadata for Docker images
4947
id: meta
5048
uses: docker/metadata-action@v5
5149
with:
@@ -68,10 +66,10 @@ jobs:
6866
type=ref,event=branch
6967
${{ github.ref_type == 'tag' && 'type=raw,value=main' || '' }}
7068
flavor: |
71-
prefix=cache-linux/arm64-
69+
prefix=cache-arm64-
7270
latest=false
7371
74-
- name: Build and push Docker image (latest)
72+
- name: Build and push Docker image
7573
uses: docker/build-push-action@v5
7674
id: build
7775
with:

.github/workflows/sync-upstream.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@ jobs:
3737
git merge --abort
3838
exit 1
3939
}
40+
# Remove upstream's docker-build.yaml to prevent duplicate/unwanted builds
41+
if [ -f .github/workflows/docker-build.yaml ]; then
42+
rm .github/workflows/docker-build.yaml
43+
git add .github/workflows/docker-build.yaml
44+
git commit -m "chore: remove upstream docker-build.yaml (using custom ARM64 workflow)" || true
45+
fi
4046
git push origin main
4147
4248
- name: Sync dev branch
@@ -47,4 +53,10 @@ jobs:
4753
git merge --abort
4854
exit 1
4955
}
56+
# Remove upstream's docker-build.yaml to prevent duplicate/unwanted builds
57+
if [ -f .github/workflows/docker-build.yaml ]; then
58+
rm .github/workflows/docker-build.yaml
59+
git add .github/workflows/docker-build.yaml
60+
git commit -m "chore: remove upstream docker-build.yaml (using custom ARM64 workflow)" || true
61+
fi
5062
git push origin dev

0 commit comments

Comments
 (0)