Skip to content

Commit c15a011

Browse files
committed
Fixed goreleaser, fixed Docker workflow
1 parent d27524e commit c15a011

File tree

4 files changed

+22
-52
lines changed

4 files changed

+22
-52
lines changed

.github/workflows/docker.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ jobs:
2626
uses: docker/setup-buildx-action@v2
2727
- name: build image
2828
run: |
29-
docker buildx build --push \
30-
--tag mrusme/journalist:latest \
31-
--tag mrusme/journalist:{{ github.ref_name }} \
32-
--platform linux/i386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 \
29+
docker buildx build \
30+
--push \
31+
--tag "mrusme/journalist:latest" \
32+
--tag "mrusme/journalist:${{ github.ref_name }}" \
33+
--platform \
34+
"linux/i386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64" \
3335
.
3436

.github/workflows/release.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v3
1414

15+
- name: Install dependencies
16+
run: |
17+
sudo apt update
18+
sudo apt install -y gcc-multilib
19+
1520
- name: Set up Go
1621
uses: actions/setup-go@v3
1722
with:

.goreleaser.yaml

Lines changed: 9 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
# .goreleaser.yaml
22
builds:
33
-
4-
env:
5-
- CGO_ENABLED=0
64
goos:
7-
- aix
8-
- android
95
- darwin
106
- dragonfly
117
- freebsd
128
- linux
139
- netbsd
1410
- openbsd
15-
- plan9
16-
- solaris
11+
# - plan9
1712
- windows
1813
goarch:
1914
- 386
@@ -28,26 +23,6 @@ builds:
2823
- 6
2924
- 7
3025
ignore:
31-
- goos: aix
32-
goarch: 386
33-
- goos: aix
34-
goarch: amd64
35-
- goos: aix
36-
goarch: arm
37-
- goos: aix
38-
goarch: arm64
39-
- goos: aix
40-
goarch: ppc64le
41-
- goos: aix
42-
goarch: riscv64
43-
44-
- goos: android
45-
goarch: ppc64
46-
- goos: android
47-
goarch: ppc64le
48-
- goos: android
49-
goarch: riscv64
50-
5126
- goos: darwin
5227
goarch: 386
5328
- goos: darwin
@@ -90,27 +65,14 @@ builds:
9065
- goos: netbsd
9166
goarch: riscv64
9267

93-
- goos: plan9
94-
goarm: arm64
95-
- goos: plan9
96-
goarm: ppc64
97-
- goos: plan9
98-
goarm: ppc64le
99-
- goos: plan9
100-
goarm: riscv64
101-
102-
- goos: solaris
103-
goarm: 386
104-
- goos: solaris
105-
goarm: arm
106-
- goos: solaris
107-
goarm: arm64
108-
- goos: solaris
109-
goarm: ppc64
110-
- goos: solaris
111-
goarm: ppc64le
112-
- goos: solaris
113-
goarm: riscv64
68+
#- goos: plan9
69+
# goarm: arm64
70+
#- goos: plan9
71+
# goarm: ppc64
72+
#- goos: plan9
73+
# goarm: ppc64le
74+
#- goos: plan9
75+
# goarm: riscv64
11476

11577
- goos: windows
11678
goarm: ppc64

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ FROM ${ARCH}golang:alpine AS builder
44
WORKDIR /go/src/app
55
COPY . .
66

7-
RUN go build
7+
RUN apk add --update-cache build-base \
8+
&& go build
89

910
FROM ${ARCH}alpine:latest AS container
1011

0 commit comments

Comments
 (0)