Merge pull request #238 from projectdiscovery/dev

v1.1.1

.github/workflows/build-test.yml

@@ -13,9 +13,9 @@ jobs:
  os: [ubuntu-latest, windows-latest, macOS-latest]
  steps:
  - name: Set up Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
  with:
- go-version: 1.17
+ go-version: 1.18
 
  - name: Check out code
  uses: actions/checkout@v3

.github/workflows/codeql-analysis.yml

@@ -28,12 +28,12 @@ jobs:
 
  # Initializes the CodeQL tools for scanning.
  - name: Initialize CodeQL
- uses: github/codeql-action/init@v1
+ uses: github/codeql-action/init@v2
  with:
  languages: ${{ matrix.language }}
 
  - name: Autobuild
- uses: github/codeql-action/autobuild@v1
+ uses: github/codeql-action/autobuild@v2
 
  - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v1
+ uses: github/codeql-action/analyze@v2

.github/workflows/dockerhub-push.yml

@@ -20,19 +20,19 @@ jobs:
  echo "::set-output name=tag::$(curl --silent "https://api.github.com/repos/projectdiscovery/dnsx/releases/latest" | jq -r .tag_name)"
 
  - name: Set up QEMU
- uses: docker/setup-qemu-action@v1
+ uses: docker/setup-qemu-action@v2
 
  - name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v1
+ uses: docker/setup-buildx-action@v2
 
  - name: Login to DockerHub
- uses: docker/login-action@v1 
+ uses: docker/login-action@v2 
  with:
  username: ${{ secrets.DOCKER_USERNAME }}
  password: ${{ secrets.DOCKER_TOKEN }}
 
  - name: Build and push
- uses: docker/build-push-action@v2
+ uses: docker/build-push-action@v3
  with:
  context: .
  platforms: linux/amd64,linux/arm64,linux/arm

.github/workflows/functional-test.yml

@@ -14,9 +14,9 @@ jobs:
  os: [ubuntu-latest, windows-latest, macOS-latest]
  steps:
  - name: Set up Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
  with:
- go-version: 1.17
+ go-version: 1.18
 
  - name: Check out code
  uses: actions/checkout@v3

.github/workflows/lint-test.yml

@@ -12,11 +12,11 @@ jobs:
  - name: Checkout code
  uses: actions/checkout@v3
  - name: "Set up Go"
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
  with: 
- go-version: 1.17
+ go-version: 1.18
  - name: Run golangci-lint
- uses: golangci/golangci-lint-action@v3.1.0
+ uses: golangci/golangci-lint-action@v3.2.0
  with:
  version: latest
  args: --timeout 5m

.github/workflows/release-binary.yml

@@ -15,12 +15,12 @@ jobs:
  fetch-depth: 0
 
  - name: "Set up Go"
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
  with: 
- go-version: 1.17
+ go-version: 1.18
 
  - name: "Create release on GitHub"
- uses: goreleaser/goreleaser-action@v2
+ uses: goreleaser/goreleaser-action@v3
  with: 
  args: "release --rm-dist"
  version: latest

.github/workflows/sonarcloud.yml

@@ -18,9 +18,9 @@ jobs:
  fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
 
  - name: "Set up Go"
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
  with: 
- go-version: 1.17
+ go-version: 1.18
 
  - name: Run unit Tests
  run: |

.gitignore

@@ -6,3 +6,4 @@ cmd/functional-test/functional-test
 cmd/functional-test/dnsx
 cmd/functional-test/log.txt
 cmd/functional-test/*.cfg
+.vscode/

Dockerfile

@@ -1,8 +1,8 @@
-FROM golang:1.17.8-alpine3.14 AS build-env
+FROM golang:1.18.2-alpine3.14 AS build-env
 RUN apk add --no-cache build-base
 RUN go install -v github.com/projectdiscovery/dnsx/cmd/dnsx@latest
 
-FROM alpine:3.15.0
+FROM alpine:3.16.2
 RUN apk add --no-cache bind-tools ca-certificates
 COPY --from=build-env /go/bin/dnsx /usr/local/bin/dnsx
 ENTRYPOINT ["dnsx"]

Makefile

@@ -3,12 +3,17 @@ GOCMD=go
 GOBUILD=$(GOCMD) build
 GOMOD=$(GOCMD) mod
 GOTEST=$(GOCMD) test
-GOGET=$(GOCMD) get
-
+GOFLAGS := -v 
+LDFLAGS := -s -w
+
+ifneq ($(shell go env GOOS),darwin)
+LDFLAGS := -extldflags "-static"
+endif
+
 all: build
 build:
-  $(GOBUILD) -v -ldflags="-extldflags=-static" -o "dnsx" cmd/dnsx/dnsx.go
+ $(GOBUILD) $(GOFLAGS) -ldflags '$(LDFLAGS)' -o "dnsx" cmd/dnsx/dnsx.go
 test: 
-  $(GOTEST) -v ./...
+ $(GOTEST) $(GOFLAGS) ./...
 tidy:
-  $(GOMOD) tidy
+ $(GOMOD) tidy