Switch from ubicloud -> blacksmith (#12606)

This commit is contained in:
Tom Moor
2026-06-06 09:02:43 -04:00
committed by GitHub
parent c75815b90c
commit 62c0f15c06
2 changed files with 18 additions and 28 deletions
+5 -7
View File
@@ -15,18 +15,16 @@ env:
jobs:
build:
runs-on: ubicloud-standard-8
runs-on: blacksmith-8vcpu-ubuntu-2404
steps:
- name: Checkout
uses: actions/checkout@v5
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
driver: docker
- name: Setup Blacksmith Builder
uses: useblacksmith/setup-docker-builder@v1
- name: Build base image
uses: docker/build-push-action@v6
uses: useblacksmith/build-push-action@v2
with:
context: .
file: Dockerfile.base
@@ -34,7 +32,7 @@ jobs:
push: false
- name: Build main image
uses: docker/build-push-action@v6
uses: useblacksmith/build-push-action@v2
with:
context: .
file: Dockerfile
+13 -21
View File
@@ -11,13 +11,13 @@ env:
jobs:
build-arm:
runs-on: ubicloud-standard-8-arm
runs-on: blacksmith-8vcpu-ubuntu-2404-arm
steps:
- name: Checkout
uses: actions/checkout@v5
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v4
- name: Setup Blacksmith Builder
uses: useblacksmith/setup-docker-builder@v1
- name: Docker base meta
id: base_meta
@@ -37,7 +37,7 @@ jobs:
- name: Build and push base image
id: base_build
uses: docker/build-push-action@v7
uses: useblacksmith/build-push-action@v2
with:
context: .
file: Dockerfile.base
@@ -45,8 +45,6 @@ jobs:
tags: ${{ env.BASE_IMAGE_NAME }}
outputs: type=image,push-by-digest=true,name-canonical=true,push=true
platforms: linux/arm64
cache-from: type=gha
cache-to: type=gha,mode=max
pull: false
- name: Docker meta
@@ -61,7 +59,7 @@ jobs:
- name: Build and push
id: build
uses: docker/build-push-action@v7
uses: useblacksmith/build-push-action@v2
with:
context: .
file: Dockerfile
@@ -69,8 +67,6 @@ jobs:
tags: ${{ env.IMAGE_NAME }}
outputs: type=image,push-by-digest=true,name-canonical=true,push=true
platforms: linux/arm64
cache-from: type=gha
cache-to: type=gha,mode=max
pull: false
build-args: |
BASE_IMAGE=${{ env.BASE_IMAGE_NAME }}@${{ steps.base_build.outputs.digest }}
@@ -90,13 +86,13 @@ jobs:
retention-days: 1
build-amd:
runs-on: ubicloud-standard-8
runs-on: blacksmith-8vcpu-ubuntu-2404
steps:
- name: Checkout
uses: actions/checkout@v5
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v4
- name: Setup Blacksmith Builder
uses: useblacksmith/setup-docker-builder@v1
- name: Docker base meta
id: base_meta
@@ -116,7 +112,7 @@ jobs:
- name: Build and push base image
id: base_build
uses: docker/build-push-action@v7
uses: useblacksmith/build-push-action@v2
with:
context: .
file: Dockerfile.base
@@ -124,8 +120,6 @@ jobs:
tags: ${{ env.BASE_IMAGE_NAME }}
outputs: type=image,push-by-digest=true,name-canonical=true,push=true
platforms: linux/amd64
cache-from: type=gha
cache-to: type=gha,mode=max
pull: false
- name: Docker meta
@@ -140,7 +134,7 @@ jobs:
- name: Build and push
id: build
uses: docker/build-push-action@v7
uses: useblacksmith/build-push-action@v2
with:
context: .
file: Dockerfile
@@ -148,8 +142,6 @@ jobs:
tags: ${{ env.IMAGE_NAME }}
outputs: type=image,push-by-digest=true,name-canonical=true,push=true
platforms: linux/amd64
cache-from: type=gha
cache-to: type=gha,mode=max
pull: false
build-args: |
BASE_IMAGE=${{ env.BASE_IMAGE_NAME }}@${{ steps.base_build.outputs.digest }}
@@ -169,7 +161,7 @@ jobs:
retention-days: 1
merge:
runs-on: ubicloud-standard-8
runs-on: blacksmith-8vcpu-ubuntu-2404
needs:
- build-amd
- build-arm
@@ -188,8 +180,8 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v4
- name: Setup Blacksmith Builder
uses: useblacksmith/setup-docker-builder@v1
- name: Docker meta
id: meta