Skip to content

Commit eb60e4b

Browse files
Generic CommitterGeneric Commit Task
Generic Committer
authored and
Generic Commit Task
committed
Rebrand
1 parent 2125744 commit eb60e4b

21 files changed

+130
-170
lines changed

‎.github/workflows/go.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ jobs:
2828
- name: Build
2929
run: |
3030
make dist-key
31-
GOOS=linux make build-gortr
32-
GOOS=darwin make build-gortr
33-
GOOS=windows EXTENSION=.exe make build-gortr
31+
GOOS=linux make build-stayrtr
32+
GOOS=darwin make build-stayrtr
33+
GOOS=windows EXTENSION=.exe make build-stayrtr
3434
GOOS=linux make build-rtrdump
3535
GOOS=darwin make build-rtrdump
3636
GOOS=windows EXTENSION=.exe make build-rtrdump
@@ -45,7 +45,7 @@ jobs:
4545
sudo gem install fpm
4646
4747
- name: Package
48-
run: make package-deb-gortr package-rpm-gortr
48+
run: make package-deb-stayrtr package-rpm-stayrtr
4949

5050
- name: Upload Artifact
5151
uses: actions/upload-artifact@v2

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ jobs:
2424
- name: Build
2525
run: |
2626
make dist-key
27-
GOOS=linux make build-gortr
28-
GOOS=darwin make build-gortr
29-
GOOS=windows EXTENSION=.exe make build-gortr
27+
GOOS=linux make build-stayrtr
28+
GOOS=darwin make build-stayrtr
29+
GOOS=windows EXTENSION=.exe make build-stayrtr
3030
GOOS=linux make build-rtrdump
3131
GOOS=darwin make build-rtrdump
3232
GOOS=windows EXTENSION=.exe make build-rtrdump
@@ -41,7 +41,7 @@ jobs:
4141
sudo gem install fpm
4242
4343
- name: Package
44-
run: make package-deb-gortr package-rpm-gortr
44+
run: make package-deb-stayrtr package-rpm-stayrtr
4545

4646
- name: Create Release
4747
id: create_release

‎Dockerfile.rtrdump.prod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG src_uri=github.com/cloudflare/gortr/cmd/rtrdump
1+
ARG src_uri=github.com/bgp/stayrtr/cmd/rtrdump
22

33
FROM golang:alpine as builder
44
ARG src_uri

‎Dockerfile.rtrmon.prod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG src_uri=github.com/cloudflare/gortr/cmd/rtrmon
1+
ARG src_uri=github.com/bgp/stayrtr/cmd/rtrmon
22

33
FROM golang:alpine as builder
44
ARG src_uri

Dockerfile.gortr renamed to Dockerfile.stayrtr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG src_dir="/gortr"
1+
ARG src_dir="/stayrtr"
22

33
FROM golang:alpine as builder
44
ARG src_dir
@@ -10,7 +10,7 @@ RUN apk --update --no-cache add git && \
1010
WORKDIR ${src_dir}
1111
COPY . .
1212

13-
RUN go build -ldflags "${LDFLAGS}" cmd/gortr/gortr.go
13+
RUN go build -ldflags "${LDFLAGS}" cmd/stayrtr/stayrtr.go
1414

1515
FROM alpine:latest as keygen
1616

@@ -24,6 +24,6 @@ RUN apk --update --no-cache add ca-certificates && \
2424
adduser -S -D -H -h / rtr
2525
USER rtr
2626

27-
COPY --from=builder ${src_dir}/gortr ${src_dir}/cmd/gortr/cf.pub /
27+
COPY --from=builder ${src_dir}/stayrtr ${src_dir}/cmd/stayrtr/cf.pub /
2828
COPY --from=keygen /private.pem /private.pem
29-
ENTRYPOINT ["./gortr"]
29+
ENTRYPOINT ["./stayrtr"]

Dockerfile.gortr.prod renamed to Dockerfile.stayrtr.prod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG src_uri=github.com/cloudflare/gortr/cmd/gortr
1+
ARG src_uri=github.com/bgp/stayrtr/cmd/stayrtr
22

33
FROM golang:alpine as builder
44
ARG src_uri
@@ -18,7 +18,7 @@ RUN apk --update --no-cache add ca-certificates && \
1818
adduser -S -D -H -h / rtr
1919
USER rtr
2020

21-
COPY --from=builder /go/bin/gortr /
22-
COPY cmd/gortr/cf.pub /
21+
COPY --from=builder /go/bin/stayrtr /
22+
COPY cmd/stayrtr/cf.pub /
2323
COPY --from=keygen /private.pem /private.pem
24-
ENTRYPOINT ["./gortr"]
24+
ENTRYPOINT ["./stayrtr"]

‎Makefile‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,32 @@ GOOS ?= linux
44
ARCH ?= $(shell uname -m)
55
BUILDINFOSDET ?=
66

7-
DOCKER_REPO := cloudflare/
8-
GORTR_NAME := gortr
9-
GORTR_VERSION := $(shell git describe --tags $(git rev-list --tags --max-count=1))
10-
VERSION_PKG := $(shell echo $(GORTR_VERSION) | sed 's/^v//g')
7+
DOCKER_REPO := bgp/
8+
STAYRTR_NAME := stayrtr
9+
STAYRTR_VERSION := $(shell git describe --tags $(git rev-list --tags --max-count=1))
10+
VERSION_PKG := $(shell echo $(STAYRTR_VERSION) | sed 's/^v//g')
1111
ARCH := x86_64
1212
LICENSE := BSD-3
13-
URL := https://github.com/cloudflare/gortr
14-
DESCRIPTION := GoRTR: a RPKI-to-Router server
13+
URL := https://github.com/bgp/stayrtr
14+
DESCRIPTION := StayRTR: a RPKI-to-Router server
1515
BUILDINFOS := ($(shell date +%FT%T%z)$(BUILDINFOSDET))
16-
LDFLAGS := '-X main.version=$(GORTR_VERSION) -X main.buildinfos=$(BUILDINFOS)'
16+
LDFLAGS := '-X main.version=$(STAYRTR_VERSION) -X main.buildinfos=$(BUILDINFOS)'
1717

1818
RTRDUMP_NAME := rtrdump
1919
RTRMON_NAME := rtrmon
2020

21-
OUTPUT_GORTR := $(DIST_DIR)gortr-$(GORTR_VERSION)-$(GOOS)-$(ARCH)$(EXTENSION)
22-
OUTPUT_RTRDUMP := $(DIST_DIR)rtrdump-$(GORTR_VERSION)-$(GOOS)-$(ARCH)$(EXTENSION)
23-
OUTPUT_RTRMON := $(DIST_DIR)rtrmon-$(GORTR_VERSION)-$(GOOS)-$(ARCH)$(EXTENSION)
21+
OUTPUT_STAYRTR := $(DIST_DIR)stayrtr-$(STAYRTR_VERSION)-$(GOOS)-$(ARCH)$(EXTENSION)
22+
OUTPUT_RTRDUMP := $(DIST_DIR)rtrdump-$(STAYRTR_VERSION)-$(GOOS)-$(ARCH)$(EXTENSION)
23+
OUTPUT_RTRMON := $(DIST_DIR)rtrmon-$(STAYRTR_VERSION)-$(GOOS)-$(ARCH)$(EXTENSION)
2424

2525
.PHONY: vet
2626
vet:
27-
go vet cmd/gortr/gortr.go
27+
go vet cmd/stayrtr/stayrtr.go
2828

2929
.PHONY: test
3030
test:
31-
go test -v github.com/cloudflare/gortr/lib
32-
go test -v github.com/cloudflare/gortr/prefixfile
31+
go test -v github.com/bgp/stayrtr/lib
32+
go test -v github.com/bgp/stayrtr/prefixfile
3333

3434
.PHONY: prepare
3535
prepare:
@@ -41,11 +41,11 @@ clean:
4141

4242
.PHONY: dist-key
4343
dist-key: prepare
44-
cp cmd/gortr/cf.pub $(DIST_DIR)
44+
cp cmd/stayrtr/cf.pub $(DIST_DIR)
4545

46-
.PHONY: build-gortr
47-
build-gortr: prepare
48-
go build -ldflags $(LDFLAGS) -o $(OUTPUT_GORTR) cmd/gortr/gortr.go
46+
.PHONY: build-stayrtr
47+
build-stayrtr: prepare
48+
go build -ldflags $(LDFLAGS) -o $(OUTPUT_STAYRTR) cmd/stayrtr/stayrtr.go
4949

5050
.PHONY: build-rtrdump
5151
build-rtrdump:
@@ -55,44 +55,44 @@ build-rtrdump:
5555
build-rtrmon:
5656
go build -ldflags $(LDFLAGS) -o $(OUTPUT_RTRMON) cmd/rtrmon/rtrmon.go
5757

58-
.PHONY: docker-gortr
59-
docker-gortr:
60-
docker build -t $(DOCKER_REPO)$(GORTR_NAME):$(GORTR_VERSION) --build-arg LDFLAGS=$(LDFLAGS) -f Dockerfile.gortr .
58+
.PHONY: docker-stayrtr
59+
docker-stayrtr:
60+
docker build -t $(DOCKER_REPO)$(STAYRTR_NAME):$(STAYRTR_VERSION) --build-arg LDFLAGS=$(LDFLAGS) -f Dockerfile.stayrtr .
6161

6262
.PHONY: docker-rtrdump
6363
docker-rtrdump:
64-
docker build -t $(DOCKER_REPO)$(RTRDUMP_NAME):$(GORTR_VERSION) --build-arg LDFLAGS=$(LDFLAGS) -f Dockerfile.rtrdump .
64+
docker build -t $(DOCKER_REPO)$(RTRDUMP_NAME):$(STAYRTR_VERSION) --build-arg LDFLAGS=$(LDFLAGS) -f Dockerfile.rtrdump .
6565

6666
.PHONY: docker-rtrmon
6767
docker-rtrmon:
68-
docker build -t $(DOCKER_REPO)$(RTRMON_NAME):$(GORTR_VERSION) --build-arg LDFLAGS=$(LDFLAGS) -f Dockerfile.rtrmon .
68+
docker build -t $(DOCKER_REPO)$(RTRMON_NAME):$(STAYRTR_VERSION) --build-arg LDFLAGS=$(LDFLAGS) -f Dockerfile.rtrmon .
6969

70-
.PHONY: package-deb-gortr
71-
package-deb-gortr: prepare
72-
fpm -s dir -t deb -n $(GORTR_NAME) -v $(VERSION_PKG) \
70+
.PHONY: package-deb-stayrtr
71+
package-deb-stayrtr: prepare
72+
fpm -s dir -t deb -n $(STAYRTR_NAME) -v $(VERSION_PKG) \
7373
--description "$(DESCRIPTION)" \
7474
--url "$(URL)" \
7575
--architecture $(ARCH) \
7676
--license "$(LICENSE)" \
7777
--package $(DIST_DIR) \
78-
$(OUTPUT_GORTR)=/usr/bin/gortr \
79-
package/gortr.service=/lib/systemd/system/gortr.service \
80-
package/gortr.env=/etc/default/gortr \
81-
cmd/gortr/cf.pub=/usr/share/gortr/cf.pub \
78+
$(OUTPUT_STAYRTR)=/usr/bin/stayrtr \
79+
package/stayrtr.service=/lib/systemd/system/stayrtr.service \
80+
package/stayrtr.env=/etc/default/stayrtr \
81+
cmd/stayrtr/cf.pub=/usr/share/stayrtr/cf.pub \
8282
$(OUTPUT_RTRDUMP)=/usr/bin/rtrdump \
8383
$(OUTPUT_RTRMON)=/usr/bin/rtrmon
8484

85-
.PHONY: package-rpm-gortr
86-
package-rpm-gortr: prepare
87-
fpm -s dir -t rpm -n $(GORTR_NAME) -v $(VERSION_PKG) \
85+
.PHONY: package-rpm-stayrtr
86+
package-rpm-stayrtr: prepare
87+
fpm -s dir -t rpm -n $(STAYRTR_NAME) -v $(VERSION_PKG) \
8888
--description "$(DESCRIPTION)" \
8989
--url "$(URL)" \
9090
--architecture $(ARCH) \
9191
--license "$(LICENSE) "\
9292
--package $(DIST_DIR) \
93-
$(OUTPUT_GORTR)=/usr/bin/gortr \
94-
package/gortr.service=/lib/systemd/system/gortr.service \
95-
package/gortr.env=/etc/default/gortr \
96-
cmd/gortr/cf.pub=/usr/share/gortr/cf.pub \
93+
$(OUTPUT_STAYRTR)=/usr/bin/stayrtr \
94+
package/stayrtr.service=/lib/systemd/system/stayrtr.service \
95+
package/stayrtr.env=/etc/default/stayrtr \
96+
cmd/stayrtr/cf.pub=/usr/share/stayrtr/cf.pub \
9797
$(OUTPUT_RTRDUMP)=/usr/bin/rtrdump \
9898
$(OUTPUT_RTRMON)=/usr/bin/rtrmon

0 commit comments

Comments
 (0)