Skip to content

Commit 437323f

Browse files
henderkeshenderkes
committed
rename static-builder to static-builder-musl, gnu-static to static-builder-gnu
run arm64 gnu job on ubuntu-arm
1 parent 5b35a96 commit 437323f

File tree

13 files changed

+51
-51
lines changed

13 files changed

+51
-51
lines changed

‎.github/workflows/static.yaml‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ jobs:
5959
- name: Create platforms matrix
6060
id: matrix
6161
run: |
62-
METADATA="$(docker buildx bake --print static-builder | jq -c)"
63-
GNU_METADATA="$(docker buildx bake --print gnu-static | jq -c)"
62+
METADATA="$(docker buildx bake --print static-builder-musl | jq -c)"
63+
GNU_METADATA="$(docker buildx bake --print static-builder-gnu | jq -c)"
6464
{
6565
echo metadata="${METADATA}"
6666
echo platforms="$(jq -c 'first(.target[]) | .platforms' <<< "${METADATA}")"
@@ -110,16 +110,16 @@ jobs:
110110
with:
111111
pull: true
112112
load: ${{ !fromJson(needs.prepare.outputs.push) || matrix.debug || matrix.mimalloc }}
113-
targets: static-builder
113+
targets: static-builder-musl
114114
set: |
115-
${{ matrix.debug && 'static-builder.args.DEBUG_SYMBOLS=1' || '' }}
116-
${{ matrix.mimalloc && 'static-builder.args.MIMALLOC=1' || '' }}
117-
${{ (github.event_name == 'pull_request' || matrix.platform == 'linux/arm64') && 'static-builder.args.NO_COMPRESS=1' || '' }}
115+
${{ matrix.debug && 'static-builder-musl.args.DEBUG_SYMBOLS=1' || '' }}
116+
${{ matrix.mimalloc && 'static-builder-musl.args.MIMALLOC=1' || '' }}
117+
${{ (github.event_name == 'pull_request' || matrix.platform == 'linux/arm64') && 'static-builder-musl.args.NO_COMPRESS=1' || '' }}
118118
*.tags=
119119
*.platform=${{ matrix.platform }}
120-
*.cache-from=type=gha,scope=${{ needs.prepare.outputs.ref || github.ref }}-static-builder${{ matrix.debug && '-debug' || '' }}${{ matrix.mimalloc && '-mimalloc' || '' }}
121-
*.cache-from=type=gha,scope=refs/heads/main-static-builder${{ matrix.debug && '-debug' || '' }}${{ matrix.mimalloc && '-mimalloc' || '' }}
122-
*.cache-to=type=gha,scope=${{ needs.prepare.outputs.ref || github.ref }}-static-builder${{ matrix.debug && '-debug' || '' }}${{ matrix.mimalloc && '-mimalloc' || '' }},ignore-error=true
120+
*.cache-from=type=gha,scope=${{ needs.prepare.outputs.ref || github.ref }}-static-builder-musl${{ matrix.debug && '-debug' || '' }}${{ matrix.mimalloc && '-mimalloc' || '' }}
121+
*.cache-from=type=gha,scope=refs/heads/main-static-builder-musl${{ matrix.debug && '-debug' || '' }}${{ matrix.mimalloc && '-mimalloc' || '' }}
122+
*.cache-to=type=gha,scope=${{ needs.prepare.outputs.ref || github.ref }}-static-builder-musl${{ matrix.debug && '-debug' || '' }}${{ matrix.mimalloc && '-mimalloc' || '' }},ignore-error=true
123123
${{ (fromJson(needs.prepare.outputs.push) && !matrix.debug && !matrix.mimalloc) && format('*.output=type=image,name={0},push-by-digest=true,name-canonical=true,push=true', env.IMAGE_NAME) || '' }}
124124
env:
125125
SHA: ${{ github.sha }}
@@ -132,24 +132,24 @@ jobs:
132132
mkdir -p /tmp/metadata
133133
134134
# shellcheck disable=SC2086
135-
digest=$(jq -r '."static-builder"."containerimage.digest"' <<< ${METADATA})
135+
digest=$(jq -r '."static-builder-musl"."containerimage.digest"' <<< ${METADATA})
136136
touch "/tmp/metadata/${digest#sha256:}"
137137
env:
138138
METADATA: ${{ steps.build.outputs.metadata }}
139139
- name: Upload metadata
140140
if: fromJson(needs.prepare.outputs.push) && !matrix.debug && !matrix.mimalloc
141141
uses: actions/upload-artifact@v4
142142
with:
143-
name: metadata-static-builder-${{ steps.prepare.outputs.sanitized_platform }}
143+
name: metadata-static-builder-musl-${{ steps.prepare.outputs.sanitized_platform }}
144144
path: /tmp/metadata/*
145145
if-no-files-found: error
146146
retention-days: 1
147147
- name: Copy binary
148148
run: |
149149
# shellcheck disable=SC2034
150-
digest=$(jq -r '."static-builder"."${{ (fromJson(needs.prepare.outputs.push) && !matrix.debug && !matrix.mimalloc) && 'containerimage.digest' || 'containerimage.config.digest' }}"' <<< "${METADATA}")
151-
docker create --platform=${{ matrix.platform }} --name static-builder "${{ (fromJson(needs.prepare.outputs.push) && !matrix.debug && !matrix.mimalloc) && '${IMAGE_NAME}@${digest}' || '${digest}' }}"
152-
docker cp "static-builder:/go/src/app/dist/${BINARY}" "${BINARY}${{ matrix.debug && '-debug' || '' }}${{ matrix.mimalloc && '-mimalloc' || '' }}"
150+
digest=$(jq -r '."static-builder-musl"."${{ (fromJson(needs.prepare.outputs.push) && !matrix.debug && !matrix.mimalloc) && 'containerimage.digest' || 'containerimage.config.digest' }}"' <<< "${METADATA}")
151+
docker create --platform=${{ matrix.platform }} --name static-builder-musl "${{ (fromJson(needs.prepare.outputs.push) && !matrix.debug && !matrix.mimalloc) && '${IMAGE_NAME}@${digest}' || '${digest}' }}"
152+
docker cp "static-builder-musl:/go/src/app/dist/${BINARY}" "${BINARY}${{ matrix.debug && '-debug' || '' }}${{ matrix.mimalloc && '-mimalloc' || '' }}"
153153
env:
154154
METADATA: ${{ steps.build.outputs.metadata }}
155155
BINARY: frankenphp-linux-${{ matrix.platform == 'linux/amd64' && 'x86_64' || 'aarch64' }}
@@ -186,7 +186,7 @@ jobs:
186186
matrix:
187187
platform: ${{ fromJson(needs.prepare.outputs.platforms) }}
188188
name: Build ${{ matrix.platform }} GNU static binary
189-
runs-on: ubuntu-24.04
189+
runs-on: ${{ startsWith(matrix.platform, 'linux/arm') && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
190190
needs: [prepare]
191191
steps:
192192
- name: Prepare
@@ -213,14 +213,14 @@ jobs:
213213
with:
214214
pull: true
215215
load: ${{ !fromJson(needs.prepare.outputs.push) }}
216-
targets: gnu-static
216+
targets: static-builder-gnu
217217
set: |
218-
${{ (github.event_name == 'pull_request' || matrix.platform == 'linux/arm64') && 'gnu-static.args.NO_COMPRESS=1' || '' }}
218+
${{ (github.event_name == 'pull_request' || matrix.platform == 'linux/arm64') && 'static-builder-gnu.args.NO_COMPRESS=1' || '' }}
219219
*.tags=
220220
*.platform=${{ matrix.platform }}
221-
*.cache-from=type=gha,scope=${{ needs.prepare.outputs.ref || github.ref }}-gnu-static
222-
*.cache-from=type=gha,scope=refs/heads/main-gnu-static
223-
*.cache-to=type=gha,scope=${{ needs.prepare.outputs.ref || github.ref }}-gnu-static,ignore-error=true
221+
*.cache-from=type=gha,scope=${{ needs.prepare.outputs.ref || github.ref }}-static-builder-gnu
222+
*.cache-from=type=gha,scope=refs/heads/main-static-builder-gnu
223+
*.cache-to=type=gha,scope=${{ needs.prepare.outputs.ref || github.ref }}-static-builder-gnu,ignore-error=true
224224
${{ fromJson(needs.prepare.outputs.push) && format('*.output=type=image,name={0}-gnu,push-by-digest=true,name-canonical=true,push=true', env.IMAGE_NAME) || '' }}
225225
env:
226226
SHA: ${{ github.sha }}
@@ -233,24 +233,24 @@ jobs:
233233
mkdir -p /tmp/metadata-gnu
234234
235235
# shellcheck disable=SC2086
236-
digest=$(jq -r '."gnu-static"."containerimage.digest"' <<< ${METADATA})
236+
digest=$(jq -r '."static-builder-gnu"."containerimage.digest"' <<< ${METADATA})
237237
touch "/tmp/metadata-gnu/${digest#sha256:}"
238238
env:
239239
METADATA: ${{ steps.build.outputs.metadata }}
240240
- name: Upload metadata
241241
if: fromJson(needs.prepare.outputs.push)
242242
uses: actions/upload-artifact@v4
243243
with:
244-
name: metadata-gnu-static-${{ steps.prepare.outputs.sanitized_platform }}
244+
name: metadata-static-builder-gnu-${{ steps.prepare.outputs.sanitized_platform }}
245245
path: /tmp/metadata-gnu/*
246246
if-no-files-found: error
247247
retention-days: 1
248248
- name: Copy binary
249249
run: |
250250
# shellcheck disable=SC2034
251-
digest=$(jq -r '."gnu-static"."${{ fromJson(needs.prepare.outputs.push) && 'containerimage.digest' || 'containerimage.config.digest' }}"' <<< "${METADATA}")
252-
docker create --platform=${{ matrix.platform }} --name gnu-static "${{ fromJson(needs.prepare.outputs.push) && format('{0}-gnu@{1}', env.IMAGE_NAME, '${digest}') || '${digest}' }}"
253-
docker cp "gnu-static:/go/src/app/dist/${BINARY}" "${BINARY}-gnu"
251+
digest=$(jq -r '."static-builder-gnu"."${{ fromJson(needs.prepare.outputs.push) && 'containerimage.digest' || 'containerimage.config.digest' }}"' <<< "${METADATA}")
252+
docker create --platform=${{ matrix.platform }} --name static-builder-gnu "${{ fromJson(needs.prepare.outputs.push) && format('{0}-gnu@{1}', env.IMAGE_NAME, '${digest}') || '${digest}' }}"
253+
docker cp "static-builder-gnu:/go/src/app/dist/${BINARY}" "${BINARY}-gnu"
254254
env:
255255
METADATA: ${{ steps.build.outputs.metadata }}
256256
BINARY: frankenphp-linux-${{ matrix.platform == 'linux/amd64' && 'x86_64' || 'aarch64' }}
@@ -292,13 +292,13 @@ jobs:
292292
- name: Download metadata
293293
uses: actions/download-artifact@v4
294294
with:
295-
pattern: metadata-static-builder-*
295+
pattern: metadata-static-builder-musl-*
296296
path: /tmp/metadata
297297
merge-multiple: true
298298
- name: Download GNU metadata
299299
uses: actions/download-artifact@v4
300300
with:
301-
pattern: metadata-gnu-static-*
301+
pattern: metadata-static-builder-gnu-*
302302
path: /tmp/metadata-gnu
303303
merge-multiple: true
304304
- name: Set up Docker Buildx
@@ -312,28 +312,28 @@ jobs:
312312
working-directory: /tmp/metadata
313313
run: |
314314
# shellcheck disable=SC2046,SC2086
315-
docker buildx imagetools create $(jq -cr '.target."static-builder".tags | map("-t " + .) | join(" ")' <<< "${METADATA}") \
315+
docker buildx imagetools create $(jq -cr '.target."static-builder-musl".tags | map("-t " + .) | join(" ")' <<< "${METADATA}") \
316316
$(printf "${IMAGE_NAME}@sha256:%s " *)
317317
env:
318318
METADATA: ${{ needs.prepare.outputs.metadata }}
319319
- name: Create GNU manifest list and push
320320
working-directory: /tmp/metadata-gnu
321321
run: |
322322
# shellcheck disable=SC2046,SC2086
323-
docker buildx imagetools create $(jq -cr '.target."gnu-static".tags | map("-t " + . + "-gnu") | join(" ")' <<< "${GNU_METADATA}") \
323+
docker buildx imagetools create $(jq -cr '.target."static-builder-gnu".tags | map("-t " + . + "-gnu") | join(" ")' <<< "${GNU_METADATA}") \
324324
$(printf "${IMAGE_NAME}-gnu@sha256:%s " *)
325325
env:
326326
GNU_METADATA: ${{ needs.prepare.outputs.gnu_metadata }}
327327
- name: Inspect image
328328
run: |
329329
# shellcheck disable=SC2046,SC2086
330-
docker buildx imagetools inspect "$(jq -cr '.target."static-builder".tags | first' <<< "${METADATA}")"
330+
docker buildx imagetools inspect "$(jq -cr '.target."static-builder-musl".tags | first' <<< "${METADATA}")"
331331
env:
332332
METADATA: ${{ needs.prepare.outputs.metadata }}
333333
- name: Inspect GNU image
334334
run: |
335335
# shellcheck disable=SC2046,SC2086
336-
docker buildx imagetools inspect "$(jq -cr '.target."gnu-static".tags | first' <<< "${GNU_METADATA}")-gnu"
336+
docker buildx imagetools inspect "$(jq -cr '.target."static-builder-gnu".tags | first' <<< "${GNU_METADATA}")-gnu"
337337
env:
338338
GNU_METADATA: ${{ needs.prepare.outputs.gnu_metadata }}
339339

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ docker buildx bake -f docker-bake.hcl --pull --no-cache --push
117117
--set static-builder.args.DEBUG_SYMBOLS=1 \
118118
--set "static-builder.platform=linux/amd64" \
119119
static-builder
120-
docker cp $(docker create --name static-builder dunglas/frankenphp:static-builder):/go/src/app/dist/frankenphp-linux-$(uname -m) frankenphp
120+
docker cp $(docker create --name static-builder-musl dunglas/frankenphp:static-builder-musl):/go/src/app/dist/frankenphp-linux-$(uname -m) frankenphp
121121
```
122122

123123
2. Replace your current version of `frankenphp` by the debug FrankenPHP executable

‎docker-bake.hcl‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -118,20 +118,20 @@ target "default" {
118118
}
119119
}
120120

121-
target "static-builder" {
121+
target "static-builder-musl" {
122122
contexts = {
123123
golang-base = "docker-image://golang:${GO_VERSION}-alpine"
124124
}
125-
dockerfile = "static-builder.Dockerfile"
125+
dockerfile = "static-builder-musl.Dockerfile"
126126
context = "./"
127127
platforms = [
128128
"linux/amd64",
129129
"linux/arm64",
130130
]
131131
tags = distinct(flatten([
132-
LATEST ? "${IMAGE_NAME}:static-builder" : "",
133-
SHA == "" || VERSION != "dev" ? "" : "${IMAGE_NAME}:static-builder-sha-${substr(SHA, 0, 7)}",
134-
VERSION == "dev" ? [] : [for v in semver(VERSION) : "${IMAGE_NAME}:static-builder-${v}"]
132+
LATEST ? "${IMAGE_NAME}:static-builder-musl" : "",
133+
SHA == "" || VERSION != "dev" ? "" : "${IMAGE_NAME}:static-builder-musl-sha-${substr(SHA, 0, 7)}",
134+
VERSION == "dev" ? [] : [for v in semver(VERSION) : "${IMAGE_NAME}:static-builder-musl-${v}"]
135135
]))
136136
labels = {
137137
"org.opencontainers.image.created" = "${timestamp()}"
@@ -144,17 +144,17 @@ target "static-builder" {
144144
secret = ["id=github-token,env=GITHUB_TOKEN"]
145145
}
146146

147-
target "gnu-static" {
148-
dockerfile = "gnu-static.Dockerfile"
147+
target "static-builder-gnu" {
148+
dockerfile = "static-builder-gnu.Dockerfile"
149149
context = "./"
150150
platforms = [
151151
"linux/amd64",
152152
"linux/arm64"
153153
]
154154
tags = distinct(flatten([
155-
LATEST ? "${IMAGE_NAME}:gnu-static" : "",
156-
SHA == "" || VERSION != "dev" ? "" : "${IMAGE_NAME}:gnu-static-sha-${substr(SHA, 0, 7)}",
157-
VERSION == "dev" ? [] : [for v in semver(VERSION) : "${IMAGE_NAME}:gnu-static-${v}"]
155+
LATEST ? "${IMAGE_NAME}:static-builder-gnu" : "",
156+
SHA == "" || VERSION != "dev" ? "" : "${IMAGE_NAME}:static-builder-gnu-sha-${substr(SHA, 0, 7)}",
157+
VERSION == "dev" ? [] : [for v in semver(VERSION) : "${IMAGE_NAME}:static-builder-gnu-${v}"]
158158
]))
159159
labels = {
160160
"org.opencontainers.image.created" = "${timestamp()}"

‎docs/cn/CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ docker buildx bake -f docker-bake.hcl --pull --no-cache --push
114114
--set static-builder.args.DEBUG_SYMBOLS=1 \
115115
--set "static-builder.platform=linux/amd64" \
116116
static-builder
117-
docker cp $(docker create --name static-builder dunglas/frankenphp:static-builder):/go/src/app/dist/frankenphp-linux-$(uname -m) frankenphp
117+
docker cp $(docker create --name static-builder-musl dunglas/frankenphp:static-builder-musl):/go/src/app/dist/frankenphp-linux-$(uname -m) frankenphp
118118
```
119119

120120
2. 将当前版本的 `frankenphp` 替换为 debug FrankenPHP 可执行文件

‎docs/cn/static.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ FrankenPHP 还支持 [将 PHP 应用程序嵌入到静态二进制文件中](emb
1313

1414
```console
1515
docker buildx bake --load static-builder
16-
docker cp $(docker create --name static-builder dunglas/frankenphp:static-builder):/go/src/app/dist/frankenphp-linux-$(uname -m) frankenphp ; docker rm static-builder
16+
docker cp $(docker create --name static-builder-musl dunglas/frankenphp:static-builder-musl):/go/src/app/dist/frankenphp-linux-$(uname -m) frankenphp ; docker rm static-builder
1717
```
1818

1919
生成的静态二进制文件名为 `frankenphp`，可在当前目录中找到。

‎docs/fr/static.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Nous fournissons une image Docker pour créer un binaire statique pour Linux :
1212

1313
```console
1414
docker buildx bake --load static-builder
15-
docker cp $(docker create --name static-builder dunglas/frankenphp:static-builder):/go/src/app/dist/frankenphp-linux-$(uname -m) frankenphp ; docker rm static-builder
15+
docker cp $(docker create --name static-builder-musl dunglas/frankenphp:static-builder-musl):/go/src/app/dist/frankenphp-linux-$(uname -m) frankenphp ; docker rm static-builder
1616
```
1717

1818
Le binaire statique résultant est nommé `frankenphp`, et il est disponible dans le répertoire courant.

‎docs/ru/CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ docker buildx bake -f docker-bake.hcl --pull --no-cache --push
114114
--set static-builder.args.DEBUG_SYMBOLS=1 \
115115
--set "static-builder.platform=linux/amd64" \
116116
static-builder
117-
docker cp $(docker create --name static-builder dunglas/frankenphp:static-builder):/go/src/app/dist/frankenphp-linux-$(uname -m) frankenphp
117+
docker cp $(docker create --name static-builder-musl dunglas/frankenphp:static-builder-musl):/go/src/app/dist/frankenphp-linux-$(uname -m) frankenphp
118118
```
119119

120120
2. Замените текущую версию `frankenphp` на бинарный файл с включенным отладочным режимом.

‎docs/ru/static.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ FrankenPHP также поддерживает [встраивание PHP-пр
1212

1313
```console
1414
docker buildx bake --load static-builder
15-
docker cp $(docker create --name static-builder dunglas/frankenphp:static-builder):/go/src/app/dist/frankenphp-linux-$(uname -m) frankenphp ; docker rm static-builder
15+
docker cp $(docker create --name static-builder-musl dunglas/frankenphp:static-builder-musl):/go/src/app/dist/frankenphp-linux-$(uname -m) frankenphp ; docker rm static-builder
1616
```
1717

1818
Созданный статический бинарный файл называется `frankenphp` и будет доступен в текущей директории.

‎docs/static.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ We provide a Docker image to build a Linux static binary:
1313

1414
```console
1515
docker buildx bake --load static-builder
16-
docker cp $(docker create --name static-builder dunglas/frankenphp:static-builder):/go/src/app/dist/frankenphp-linux-$(uname -m) frankenphp ; docker rm static-builder
16+
docker cp $(docker create --name static-builder-musl dunglas/frankenphp:static-builder-musl):/go/src/app/dist/frankenphp-linux-$(uname -m) frankenphp ; docker rm static-builder
1717
```
1818

1919
The resulting static binary is named `frankenphp` and is available in the current directory.

‎docs/tr/CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ docker buildx bake -f docker-bake.hcl --pull --no-cache --push
114114
--set static-builder.args.DEBUG_SYMBOLS=1 \
115115
--set "static-builder.platform=linux/amd64" \
116116
static-builder
117-
docker cp $(docker create --name static-builder dunglas/frankenphp:static-builder):/go/src/app/dist/frankenphp-linux-$(uname -m) frankenphp
117+
docker cp $(docker create --name static-builder-musl dunglas/frankenphp:static-builder-musl):/go/src/app/dist/frankenphp-linux-$(uname -m) frankenphp
118118
```
119119

120120
2. Mevcut `frankenphp` sürümünüzü hata ayıklama FrankenPHP çalıştırılabilir dosyasıyla değiştirin

0 commit comments

Comments
 (0)