Skip to content

Commit 7c67613

Browse files
committed
chore: upgrade goreleaser config
1 parent 142944d commit 7c67613

File tree

2 files changed

+42
-52
lines changed

2 files changed

+42
-52
lines changed

.goreleaser.yml

Lines changed: 39 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ release:
1313
draft: true
1414
env:
1515
- CGO_ENABLED=0
16+
1617
builds:
1718
- id: caddy
1819
dir: caddy/mercure
@@ -36,7 +37,10 @@ builds:
3637
- "5"
3738
- "6"
3839
- "7"
39-
# Legacy build
40+
ignore:
41+
- goos: windows
42+
goarch: arm
43+
4044
- id: legacy
4145
dir: cmd/mercure
4246
ldflags:
@@ -53,10 +57,15 @@ builds:
5357
- amd64
5458
- arm
5559
- arm64
60+
ignore:
61+
- goos: windows
62+
goarch: arm
63+
5664
upx:
5765
- enabled: true
5866
goos: [linux]
5967
compress: best
68+
6069
archives:
6170
- ids:
6271
- caddy
@@ -93,62 +102,40 @@ archives:
93102
format_overrides:
94103
- goos: windows
95104
formats: [zip]
96-
dockers:
97-
- ids:
98-
- caddy
99-
goos: linux
100-
goarch: amd64
101-
image_templates:
102-
- "dunglas/mercure:{{ .Tag }}-amd64"
103-
- "dunglas/mercure:v{{ .Major }}-amd64"
104-
- "dunglas/mercure:v{{ .Major }}.{{ .Minor }}-amd64"
105-
- "dunglas/mercure:latest-amd64"
106-
use: buildx
107-
build_flag_templates:
108-
- "--platform=linux/amd64"
109-
extra_files:
110-
- Caddyfile
111-
- dev.Caddyfile
112-
- ids:
105+
106+
dockers_v2:
107+
- id: caddy
108+
ids:
113109
- caddy
114-
goos: linux
115-
goarch: arm64
116-
image_templates:
117-
- "dunglas/mercure:{{ .Tag }}-arm64v8"
118-
- "dunglas/mercure:v{{ .Major }}-arm64v8"
119-
- "dunglas/mercure:v{{ .Major }}.{{ .Minor }}-arm64v8"
120-
- "dunglas/mercure:latest-arm64v8"
121-
use: buildx
122-
build_flag_templates:
123-
- "--platform=linux/arm64/v8"
110+
images:
111+
- "dunglas/mercure"
112+
tags:
113+
- "{{ .Tag }}"
114+
- "v{{ .Major }}"
115+
- "v{{ .Major }}.{{ .Minor }}"
116+
- "latest"
117+
platforms:
118+
- linux/amd64
119+
- linux/arm64/v8
124120
extra_files:
125121
- Caddyfile
126122
- dev.Caddyfile
127-
- ids:
123+
124+
- id: legacy
125+
ids:
128126
- legacy
129127
dockerfile: Dockerfile.legacy
130-
image_templates:
131-
- "dunglas/mercure:legacy-{{ .Tag }}"
132-
- "dunglas/mercure:legacy-v{{ .Major }}"
133-
- "dunglas/mercure:legacy-v{{ .Major }}.{{ .Minor }}"
134-
- "dunglas/mercure:legacy-latest"
135-
docker_manifests:
136-
- name_template: dunglas/mercure:{{ .Tag }}
137-
image_templates:
138-
- dunglas/mercure:{{ .Tag }}-amd64
139-
- dunglas/mercure:{{ .Tag }}-arm64v8
140-
- name_template: dunglas/mercure:v{{ .Major }}
141-
image_templates:
142-
- dunglas/mercure:v{{ .Major }}-amd64
143-
- dunglas/mercure:v{{ .Major }}-arm64v8
144-
- name_template: dunglas/mercure:v{{ .Major }}.{{ .Minor }}
145-
image_templates:
146-
- dunglas/mercure:v{{ .Major }}.{{ .Minor }}-amd64
147-
- dunglas/mercure:v{{ .Major }}.{{ .Minor }}-arm64v8
148-
- name_template: dunglas/mercure:latest
149-
image_templates:
150-
- dunglas/mercure:latest-amd64
151-
- dunglas/mercure:latest-arm64v8
128+
images:
129+
- "dunglas/mercure"
130+
tags:
131+
- "legacy-{{ .Tag }}"
132+
- "legacy-v{{ .Major }}"
133+
- "legacy-v{{ .Major }}.{{ .Minor }}"
134+
- "legacy-latest"
135+
platforms:
136+
- linux/amd64
137+
- linux/arm64/v8
138+
152139
nfpms:
153140
- id: linux_packages
154141
package_name: mercure
@@ -165,6 +152,7 @@ nfpms:
165152
vendor: "Dunglas Services SAS"
166153
homepage: "https://mercure.rocks"
167154
bindir: /usr/bin
155+
168156
signs:
169157
- artifacts: checksum
170158
args:

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
# syntax=docker/dockerfile:1
22
FROM caddy:2-alpine
33

4+
ARG TARGETPLATFORM
5+
46
LABEL org.opencontainers.image.title=Mercure.rocks
57
LABEL org.opencontainers.image.description="Real-time made easy"
68
LABEL org.opencontainers.image.url=https://mercure.rocks
79
LABEL org.opencontainers.image.source=https://github.com/dunglas/mercure
810
LABEL org.opencontainers.image.licenses=AGPL-3.0-or-later
911
LABEL org.opencontainers.image.vendor="Kévin Dunglas"
1012

11-
COPY mercure /usr/bin/caddy
13+
COPY ${TARGETPLATFORM}/mercure /usr/bin/caddy
1214
COPY Caddyfile /etc/caddy/Caddyfile
1315
COPY dev.Caddyfile /etc/caddy/dev.Caddyfile

0 commit comments

Comments
 (0)