Skip to content
This repository was archived by the owner on Feb 29, 2024. It is now read-only.

Commit cced326

Browse files
committed
fix dockerfiles
1 parent 541b9de commit cced326

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

Dockerfile.rtrdump

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ ARG src_dir="/rtrdump"
22

33
FROM golang:alpine as builder
44
ARG src_dir
5+
ARG LDFLAGS=""
56

67
RUN apk --update --no-cache add git && \
78
mkdir -p ${src_dir}
89

910
WORKDIR ${src_dir}
1011
COPY . .
1112

12-
RUN go build cmd/rtrdump/rtrdump.go
13+
RUN go build -ldflags "${LDFLAGS}" cmd/rtrdump/rtrdump.go
1314

1415
FROM alpine:latest
1516
ARG src_dir

Dockerfile.rtrmon

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ ARG src_dir="/rtrmon"
22

33
FROM golang:alpine as builder
44
ARG src_dir
5+
ARG LDFLAGS=""
56

67
RUN apk --update --no-cache add git && \
78
mkdir -p ${src_dir}
89

910
WORKDIR ${src_dir}
1011
COPY . .
1112

12-
RUN go build cmd/rtrmon/rtrmon.go
13+
RUN go build -ldflags "${LDFLAGS}" cmd/rtrmon/rtrmon.go
1314

1415
FROM alpine:latest
1516
ARG src_dir

cmd/rtrmon/rtrmon.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ func decodeJSON(data []byte) (*prefixfile.ROAList, error) {
142142
}
143143

144144
type Client struct {
145-
//Data prefixfile.ROAList
146145
ValidateSSH bool
147146
ValidateCert bool
148147
SSHAuthUser string
@@ -659,7 +658,7 @@ func (c *Comparator) Compare() {
659658
}
660659

661660
if c.OneOff && donePrimary && doneSecondary {
662-
// save file
661+
// save file (one-off)
663662
stop = true
664663
}
665664

@@ -699,8 +698,6 @@ func main() {
699698
os.Exit(0)
700699
}
701700

702-
// if len(file) > 8 && (file[0:7] == "http://" || file[0:8] == "https://") {
703-
704701
lvl, _ := log.ParseLevel(*LogLevel)
705702
log.SetLevel(lvl)
706703

0 commit comments

Comments
 (0)