Merge pull request #198 from projectdiscovery/dev

Interactsh v1.0.0
projectdiscovery · Jan 23, 2022 · 18f2f64 · 18f2f64
2 parents 8d36f91 + 69445fb
commit 18f2f64
Show file tree

Hide file tree

Showing 28 changed files with 2,084 additions and 1,415 deletions.
diff --git a/.github/docker/client/Dockerfile b/.github/docker/client/Dockerfile
@@ -4,7 +4,7 @@ RUN apk add build-base
 RUN go install -v github.com/projectdiscovery/interactsh/cmd/interactsh-client@latest
 
 # Release
-FROM alpine:3.14
+FROM alpine:3.15.0
 RUN apk -U upgrade --no-cache \
     && apk add --no-cache bind-tools ca-certificates
 COPY --from=build-env /go/bin/interactsh-client /usr/local/bin/interactsh-client

diff --git a/.github/docker/server/Dockerfile b/.github/docker/server/Dockerfile
@@ -4,7 +4,7 @@ RUN apk add build-base
 RUN go install -v github.com/projectdiscovery/interactsh/cmd/interactsh-server@latest
 
 # Release
-FROM alpine:3.14
+FROM alpine:3.15.0
 RUN apk -U upgrade --no-cache \
     && apk add --no-cache bind-tools ca-certificates
 COPY --from=build-env /go/bin/interactsh-server /usr/local/bin/interactsh-server

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -3,33 +3,62 @@ before:
     - go mod tidy
 
 builds:
-- env:
+- main: cmd/interactsh-client/main.go
+  binary: interactsh-client
+  id: interactsh-client
+
+  env:
   - CGO_ENABLED=0
-  goos:
-    - windows
-    - linux
-    - darwin
-  goarch:
-    - amd64
-    - 386
-    - arm
-    - arm64
 
+  goos: [windows,linux,darwin]
+  goarch: [amd64,386,arm,arm64]
   ignore:
     - goos: darwin
-      goarch: '386'
+      goarch: 386
     - goos: windows
-      goarch: 'arm'
+      goarch: arm
     - goos: windows
-      goarch: 'arm64'
+      goarch: arm64
+
+- main: cmd/interactsh-server/main.go
+  binary: interactsh-server
+  id: interactsh-server
+
+  env:
+  - CGO_ENABLED=0
 
-  binary: 'interactsh-client'
-  main: cmd/interactsh-client/main.go
+  goos: [windows,linux,darwin]
+  goarch: [amd64,386,arm,arm64]
+  ignore:
+    - goos: darwin
+      goarch: 386
+    - goos: windows
+      goarch: arm
+    - goos: windows
+      goarch: arm64
 
 archives:
 - format: zip
+  id: client
+  builds: [interactsh-client]
+  name_template: "{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
+  replacements:
+      darwin: macOS
+      linux: Linux
+      windows: Windows
+      386: i386
+      amd64: x86_64
+
+- format: zip
+  id: server
+  builds: [interactsh-server]
+  name_template: "{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
   replacements:
       darwin: macOS
+      linux: Linux
+      windows: Windows
+      386: i386
+      amd64: x86_64
 
 checksum:
   algorithm: sha256