Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Preparing - release 1.0.1 #80

Merged
merged 5 commits into from
Mar 2, 2023
Merged

Preparing - release 1.0.1 #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
04f2e6f
Update banner.go
Mzack9999 Feb 28, 2023
50583b4
Merge pull request #78 from projectdiscovery/maint-bump-version
Mzack9999 Feb 28, 2023
9372dd3
Fixing dockerfile
Mzack9999 Feb 28, 2023
d6b5b0e
Merge pull request #79 from projectdiscovery/issue-77-docker
Mzack9999 Feb 28, 2023
e0704a5
Update workflow files to use ubuntu-latest-16-cores
ehsandeep Mar 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
build:
name: Test Builds
runs-on: ubuntu-latest
runs-on: ubuntu-latest-16-cores
steps:
- name: Set up Go
uses: actions/setup-go@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dockerhub-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
lint:
name: Lint Test
runs-on: ubuntu-latest
runs-on: ubuntu-latest-16-cores
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-binary.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
release:
runs-on: ubuntu-latest
runs-on: ubuntu-latest-16-cores
steps:
- name: "Check out code"
uses: actions/checkout@v3
Expand Down
35 changes: 11 additions & 24 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,15 @@
##
##Build
##
FROM golang:1.20.1 AS builder
# Base
FROM golang:1.20.1-alpine AS builder

WORKDIR /asnmap
RUN apk add --no-cache git build-base gcc musl-dev
WORKDIR /app
COPY . /app
RUN go mod download
RUN go build ./cmd/asnmap

COPY go.mod go.sum cmd . ./

RUN go build -o "asnmap" ./cmd/asnmap/

#
#Deploy
#
FROM alpine:3.17.2
RUN apk -U upgrade --no-cache \
&& apk add --no-cache bind-tools ca-certificates
COPY --from=builder /app/asnmap /usr/local/bin/

RUN mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2 && \
apk update && \
apk add ca-certificates wget && \
apk add ca-certificates && \
rm -rf /var/cache/apk/* && \
wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.30-r0/glibc-2.30-r0.apk && \
apk --no-cache add glibc-2.30-r0.apk

COPY --from=builder /libs/asnmap .

ENTRYPOINT [ "./asnmap" ]
ENTRYPOINT ["asnmap"]
4 changes: 2 additions & 2 deletions runner/banner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ const banner = `
/ _ | / __/ |/ /_ _ ___ ____
/ __ |_\ \/ / ' \/ _ / _ \
/_/ |_/___/_/|_/_/_/_/\_,_/ .__/
/_/ v1.0.0
/_/ v1.0.1
`

// Version is the current version of mapcidr
const Version = `v1.0.0`
const Version = `v1.0.1`

// showBanner is used to show the banner to the user
func showBanner() {
Expand Down