Skip to content

Commit

Permalink
fix goreleaser error, add egbuilder to release (easegress-io#1066)
Browse files Browse the repository at this point in the history
  • Loading branch information
suchen-sci committed Aug 16, 2023
1 parent c7d91cf commit fabdf18
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 3 deletions.
17 changes: 16 additions & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ before:
- go generate ./...

snapshot:
name_template: '{{ .Tag }}'
name_template: '{{ .Version }}'
checksum:
name_template: 'checksums.txt'
changelog:
Expand All @@ -26,6 +26,20 @@ builds:
- -X github.com/megaease/easegress/v2/pkg/version.RELEASE={{ .Tag }}
- -X github.com/megaease/easegress/v2/pkg/version.COMMIT={{.Commit}}
- -X github.com/megaease/easegress/v2/pkg/version.REPO=megaease/easegress

- id: builder
main: cmd/builder/main.go
binary: bin/egbuilder
env:
- CGO_ENABLED=0
goos:
- linux
- darwin
ldflags:
- -s -w
- -X github.com/megaease/easegress/v2/pkg/version.RELEASE={{ .Tag }}
- -X github.com/megaease/easegress/v2/pkg/version.COMMIT={{.Commit}}
- -X github.com/megaease/easegress/v2/pkg/version.REPO=megaease/easegress

- id: server
main: cmd/server/main.go
Expand Down Expand Up @@ -66,6 +80,7 @@ dockers:
ids:
- client
- server
- builder

dockerfile: build/package/Dockerfile.goreleaser

Expand Down
2 changes: 1 addition & 1 deletion build/package/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ FROM alpine:3.18
WORKDIR /opt/easegress

COPY build/package/entrypoint.sh /
COPY build/bin/egctl build/bin/easegress-server /opt/easegress/bin/
COPY build/bin/egctl build/bin/easegress-server build/bin/egbuilder /opt/easegress/bin/

# If the following apk command takes too much time or failed because of
# network issues, we can setup a proxy for it.
Expand Down
2 changes: 1 addition & 1 deletion build/package/Dockerfile.goreleaser
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM alpine:3.18

WORKDIR /opt/easegress

ADD egctl easegress-server /opt/easegress/bin/
ADD bin/egctl bin/easegress-server bin/egbuilder /opt/easegress/bin/
COPY build/package/entrypoint.sh /

RUN apk --no-cache add tini tzdata && \
Expand Down

0 comments on commit fabdf18

Please sign in to comment.