diff --git a/.gitignore b/.gitignore index a6a9269..14f404e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,8 @@ *.swp *.gor +*.rpm +*.dep +*.pkg *.out diff --git a/Dockerfile.dev b/Dockerfile.dev index f946a20..f76930a 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -3,8 +3,8 @@ FROM golang:1.14 RUN apt-get update && apt-get install ruby vim-common -y RUN apt-get install flex bison -y -RUN wget http://www.tcpdump.org/release/libpcap-1.8.1.tar.gz && tar xzf libpcap-1.8.1.tar.gz && cd libpcap-1.8.1 && ./configure && make install -RUN apt-get install default-jre default-jdk -y +RUN wget http://www.tcpdump.org/release/libpcap-1.9.1.tar.gz && tar xzf libpcap-1.9.1.tar.gz && cd libpcap-1.9.1 && ./configure && make install + RUN go get github.com/google/gopacket RUN go get -u golang.org/x/lint/golint diff --git a/Makefile b/Makefile index 5962a29..3d8ae48 100644 --- a/Makefile +++ b/Makefile @@ -12,19 +12,45 @@ LDFLAGS = -ldflags "-X main.VERSION=$(VERSION)$(PREFIX) -extldflags \"-static\" MAC_LDFLAGS = -ldflags "-X main.VERSION=$(VERSION)$(PREFIX) -X main.DEMO=$(DEMO)" FADDR = ":8000" +FPMCOMMON= \ + --name goreplay \ + --description "GoReplay is an open-source network monitoring tool which can record your live traffic, and use it for shadowing, load testing, monitoring and detailed analysis." \ + -v $(VERSION) \ + --vendor "Leonid Bugaev" \ + -m "" \ + --url "https://goreplay.org" \ + -s dir \ + -C /tmp/gor-build \ + release: release-x64 release-mac release-bin: docker run -v `pwd`:$(SOURCE_PATH) -t --env GOOS=linux --env GOARCH=amd64 -i gor go build -o gor -tags netgo $(LDFLAGS) release-x64: - docker run -v `pwd`:$(SOURCE_PATH) -t --env GOOS=linux --env GOARCH=amd64 -i $(CONTAINER) go build -o gor -tags netgo $(LDFLAGS) && tar -czf gor_$(VERSION)$(PREFIX)_x64.tar.gz gor && rm gor + docker run -v `pwd`:$(SOURCE_PATH) -t --env GOOS=linux --env GOARCH=amd64 -i $(CONTAINER) go build -o gor -tags netgo $(LDFLAGS) + tar -czf gor_$(VERSION)$(PREFIX)_x64.tar.gz gor + mkdir -p /tmp/gor-build + mv ./gor /tmp/gor-build/gor + cd /tmp/gor-build + fpm $(FPMCOMMON) -a amd64 -t deb ./=/usr/local/bin + fpm $(FPMCOMMON) -a amd64 -t rpm ./=/usr/local/bin + rm -rf /tmp/gor-build release-x86: - docker run -v `pwd`:$(SOURCE_PATH) -t --env GOOS=linux --env GOARCH=386 -i $(CONTAINER) go build -o gor -tags netgo $(LDFLAGS) && tar -czf gor_$(VERSION)$(PREFIX)_x86.tar.gz gor && rm gor + docker run -v `pwd`:$(SOURCE_PATH) -t --env GOOS=linux --env GOARCH=386 -i $(CONTAINER) go build -o gor -tags netgo $(LDFLAGS) + tar -czf gor_$(VERSION)$(PREFIX)_x86.tar.gz gor + rm gor release-mac: - go build -o gor $(MAC_LDFLAGS) && tar -czf gor_$(VERSION)$(PREFIX)_mac.tar.gz gor && rm gor + go build -o gor $(MAC_LDFLAGS) + tar -czf gor_$(VERSION)$(PREFIX)_mac.tar.gz gor + mkdir -p /tmp/gor-build + mv ./gor /tmp/gor-build/gor + cd /tmp/gor-build + fpm $(FPMCOMMON) -a amd64 -t osxpkg ./=/usr/local/bin + rm -rf /tmp/gor-build + install: go install $(MAC_LDFLAGS) diff --git a/version.go b/version.go index b794230..e64fc4a 100644 --- a/version.go +++ b/version.go @@ -1,4 +1,4 @@ package main // VERSION the current version of goreplay -const VERSION = "1.0.0" +const VERSION = "1.1.0"