diff --git a/.github/workflows/build.yml b/.github/workflows/build-test.yml similarity index 100% rename from .github/workflows/build.yml rename to .github/workflows/build-test.yml diff --git a/.github/workflows/dockerhub-push.yml b/.github/workflows/dockerhub-push.yml index 2db72531..2b5f8851 100644 --- a/.github/workflows/dockerhub-push.yml +++ b/.github/workflows/dockerhub-push.yml @@ -9,7 +9,7 @@ on: jobs: docker: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-16-cores steps: - name: Git Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint-test.yml similarity index 100% rename from .github/workflows/lint.yml rename to .github/workflows/lint-test.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release-binary.yml similarity index 62% rename from .github/workflows/release.yml rename to .github/workflows/release-binary.yml index 1206557f..a0cd73cc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release-binary.yml @@ -8,7 +8,7 @@ on: jobs: release: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-16-cores steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 @@ -20,6 +20,8 @@ jobs: args: "release --rm-dist" version: latest workdir: . - env: + env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - SLACK_WEBHOOK: "${{ secrets.RELEASE_SLACK_WEBHOOK }}" \ No newline at end of file + SLACK_WEBHOOK: "${{ secrets.RELEASE_SLACK_WEBHOOK }}" + DISCORD_WEBHOOK_ID: "${{ secrets.DISCORD_WEBHOOK_ID }}" + DISCORD_WEBHOOK_TOKEN: "${{ secrets.DISCORD_WEBHOOK_TOKEN }}" \ No newline at end of file diff --git a/.gitignore b/.gitignore index 379551a5..c1083f17 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ - cmd/cloudlist/cloudlist .DS_Store +dist \ No newline at end of file diff --git a/.goreleaser.yml b/.goreleaser.yml index 054c213c..5e1678af 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -42,4 +42,8 @@ announce: enabled: true channel: '#release' username: GoReleaser - message_template: '{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}' \ No newline at end of file + message_template: 'New Release: {{ .ProjectName }} {{.Tag}} is published! Check it out at {{ .ReleaseURL }}' + + discord: + enabled: true + message_template: '**New Release: {{ .ProjectName }} {{.Tag}}** is published! Check it out at {{ .ReleaseURL }}' \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index ef2926c1..7fd81a93 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,15 @@ -FROM golang:1.20.3-alpine AS builder -RUN apk add --no-cache git -RUN go install -v github.com/projectdiscovery/cloudlist/cmd/cloudlist@latest +# Base +FROM golang:1.20.1-alpine AS builder +RUN apk add --no-cache build-base +WORKDIR /app +COPY . /app +RUN go mod download +RUN go build ./cmd/cloudlist -FROM alpine:3.17.3 +# Release +FROM alpine:3.17.2 RUN apk -U upgrade --no-cache \ && apk add --no-cache bind-tools ca-certificates -COPY --from=builder /go/bin/cloudlist /usr/local/bin/ +COPY --from=builder /app/cloudlist /usr/local/bin/ ENTRYPOINT ["cloudlist"] \ No newline at end of file diff --git a/internal/runner/banner.go b/internal/runner/banner.go index ed2e6c7e..8ef9147e 100644 --- a/internal/runner/banner.go +++ b/internal/runner/banner.go @@ -6,23 +6,19 @@ import ( ) const banner = ` - ________ _____ __ - / ____/ /___ __ ______/ / (_)____/ /_ - / / / / __ \/ / / / __ / / / ___/ __/ -/ /___/ / /_/ / /_/ / /_/ / / (__ ) /_ -\____/_/\____/\__,_/\__,_/_/_/____/\__/ v1.0.2 + _______ _____ __ + / ___/ /__ __ _____/ / (_)__ / /_ +/ /__/ / _ \/ // / _ / / (_-