Skip to content

Commit

Permalink
Fix docker build
Browse files Browse the repository at this point in the history
  • Loading branch information
nekohasekai committed Sep 18, 2024
1 parent 1400f77 commit 3175084
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
13 changes: 7 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM golang:1.23-alpine AS builder
FROM --platform=$BUILDPLATFORM golang:1.23-bookworm AS builder
LABEL maintainer="nekohasekai <[email protected]>"
COPY . /go/src/github.com/sagernet/sing-box
WORKDIR /go/src/github.com/sagernet/sing-box
Expand All @@ -9,19 +9,20 @@ ENV CGO_ENABLED=0
ENV GOOS=$TARGETOS
ENV GOARCH=$TARGETARCH
RUN set -ex \
&& apk add git build-base \
&& apt update \
&& apt install -y git build-essential \
&& export COMMIT=$(git rev-parse --short HEAD) \
&& export VERSION=$(go run ./cmd/internal/read_tag) \
&& go build -v -trimpath -tags \
"with_gvisor,with_quic,with_dhcp,with_wireguard,with_ech,with_utls,with_reality_server,with_acme,with_clash_api" \
-o /go/bin/sing-box \
-ldflags "-X \"github.com/sagernet/sing-box/constant.Version=$VERSION\" -s -w -buildid=" \
./cmd/sing-box
FROM --platform=$TARGETPLATFORM alpine AS dist
FROM --platform=$TARGETPLATFORM debian:stable AS dist
LABEL maintainer="nekohasekai <[email protected]>"
RUN set -ex \
&& apk upgrade \
&& apk add bash tzdata ca-certificates nftables \
&& rm -rf /var/cache/apk/*
&& apt update \
&& apt install -y ca-certificates nftables \
&& apt clean
COPY --from=builder /go/bin/sing-box /usr/local/bin/sing-box
ENTRYPOINT ["sing-box"]
2 changes: 1 addition & 1 deletion cmd/internal/build_shared/tag.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
)

func ReadTag() (string, error) {
currentTag, err := shell.Exec("git", "describe", "--tags").ReadOutput()
currentTag, err := shell.Exec("git", "describe", "--tags").Read()
if err != nil {
return currentTag, err
}
Expand Down
3 changes: 0 additions & 3 deletions cmd/internal/read_tag/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,4 @@ func main() {
} else {
_, err = os.Stdout.WriteString(currentTag + "\n")

Check failure on line 16 in cmd/internal/read_tag/main.go

View workflow job for this annotation

GitHub Actions / Build

ineffectual assignment to err (ineffassign)
}
if err != nil {
log.Error(err)
}
}

0 comments on commit 3175084

Please sign in to comment.