Removed unnecessary files from Docker image

sentinel-official · Mar 21, 2023 · f15b5c0 · f15b5c0
1 parent 440149f
commit f15b5c0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -14,6 +14,7 @@ FROM alpine:3.17
 COPY --from=build /go/bin/sentinelnode /usr/local/bin/process
 COPY --from=build /root/hnsd/hnsd /usr/local/bin/hnsd
 
-RUN apk add --no-cache ip6tables unbound-libs v2ray wireguard-tools
+RUN apk add --no-cache unbound-libs v2ray wireguard-tools && \
+    rm -rf /etc/v2ray/ /usr/share/v2ray/
 
 CMD ["process"]
diff --git a/Makefile b/Makefile
@@ -1,35 +1,34 @@
 .DEFAULT_GOAL := default
-PACKAGES := $(shell go list ./...)
 VERSION := $(shell git describe --tags | sed 's/^v//' | rev | cut -d - -f 2- | rev)
 COMMIT := $(shell git log -1 --format='%H')
 
-BUILD_TAGS := $(strip netgo)
+TAGS := $(strip netgo)
 LD_FLAGS := -s -w \
 	-X github.com/cosmos/cosmos-sdk/version.Name=sentinel \
 	-X github.com/cosmos/cosmos-sdk/version.AppName=sentinelnode \
 	-X github.com/cosmos/cosmos-sdk/version.Version=${VERSION} \
 	-X github.com/cosmos/cosmos-sdk/version.Commit=${COMMIT} \
-	-X github.com/cosmos/cosmos-sdk/version.BuildTags=${BUILD_TAGS}
+	-X github.com/cosmos/cosmos-sdk/version.BuildTags=${TAGS}
 
 .PHONY: benchmark
 benchmark:
-	@go test -mod=readonly -v -bench= ${PACKAGES}
+	@go test -bench -mod=readonly -v ./...
 
 .PHONY: build
 build:
-	go build -mod=readonly -tags="${BUILD_TAGS}" -ldflags="${LD_FLAGS}" \
+	go build -ldflags="${LD_FLAGS}" -mod=readonly -tags="${TAGS}" -trimpath \
 		-o ./bin/sentinelnode main.go
 
 .PHONY: clean
 clean:
 	rm -rf ./bin ./vendor
 
-.PHONE: default
+.PHONY: default
 default: clean build
 
 .PHONY: install
 install:
-	go build -mod=readonly -tags="${BUILD_TAGS}" -ldflags="${LD_FLAGS}" \
+	go build -ldflags="${LD_FLAGS}" -mod=readonly -tags="${TAGS}" -trimpath \
 		-o "${GOPATH}/bin/sentinelnode" main.go
 
 .PHONY: build-image
@@ -42,7 +41,7 @@ go-lint:
 
 .PHONY: test
 test:
-	@go test -mod=readonly -v -cover ${PACKAGES}
+	@go test -cover -mod=readonly -v ./...
 
 .PHONY: tools
 tools:

diff --git a/go.mod b/go.mod
@@ -146,7 +146,7 @@ require (
 	golang.org/x/sys v0.6.0 // indirect
 	golang.org/x/term v0.6.0 // indirect
 	golang.org/x/text v0.8.0 // indirect
-	google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
+	google.golang.org/genproto v0.0.0-20230320184635-7606e756e683 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

diff --git a/go.sum b/go.sum
@@ -1290,8 +1290,8 @@ google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6D
 google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210126160654-44e461bb6506/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA=
-google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s=
+google.golang.org/genproto v0.0.0-20230320184635-7606e756e683 h1:khxVcsk/FhnzxMKOyD+TDGwjbEOpcPuIpmafPGFmhMA=
+google.golang.org/genproto v0.0.0-20230320184635-7606e756e683/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=