release: v1.3.7.1

ci: fix failing whois test
ci: fix typo in release workflow
2025-11-02 13:02:29 +01:00 · 2024-03-12 18:05:50 -07:00 · 2024-03-12 18:03:23 -07:00 · 2024-03-12 17:56:52 -07:00 · 2024-03-12 17:47:29 -07:00 · 2024-03-12 17:46:56 -07:00
12 changed files with 90 additions and 12 deletions
--- a/.github/workflows/develop.yaml
+++ b/.github/workflows/develop.yaml
@@ -47,7 +47,7 @@ jobs:
      - name: Test whois binary in frontend image
        run: |
          docker build -t local/frontend frontend/
-          docker run --rm --net host --entrypoint whois local/frontend github.com || exit 1
+          docker run --rm --net host --entrypoint whois local/frontend -I github.com || exit 1
          docker run --rm --net host --entrypoint whois local/frontend -h whois.ripe.net github.com || exit 1
          docker run --rm --net host --entrypoint whois local/frontend -h whois.ripe.net:43 github.com || exit 1

@@ -57,6 +57,12 @@ jobs:
          docker run --rm --net host --entrypoint traceroute local/proxy 127.0.0.1 || exit 1
          docker run --rm --net host --entrypoint traceroute local/proxy ::1 || exit 1

+      - name: Test mtr binary in proxy image
+        run: |
+          docker build -t local/proxy:mtr -f proxy/Dockerfile.mtr proxy/
+          docker run --rm --net host --entrypoint mtr local/proxy:mtr -w -c1 -Z1 -G1 -b 127.0.0.1 || exit 1
+          docker run --rm --net host --entrypoint mtr local/proxy:mtr -w -c1 -Z1 -G1 -b ::1 || exit 1
+
  docker-develop:
    runs-on: ubuntu-latest
    needs:
@@ -106,3 +112,16 @@ jobs:
            xddxdd/bird-lgproxy-go:develop-${{ github.sha }}
            ghcr.io/xddxdd/bird-lg-go:proxy-develop
            ghcr.io/xddxdd/bird-lg-go:proxy-develop-${{ github.sha }}
+
+      - name: Build proxy docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: '{{defaultContext}}:proxy'
+          file: 'Dockerfile.mtr'
+          platforms: linux/amd64,linux/arm64,linux/386,linux/arm/v7
+          push: true
+          tags: |
+            xddxdd/bird-lgproxy-go:develop-mtr
+            xddxdd/bird-lgproxy-go:develop-${{ github.sha }}-mtr
+            ghcr.io/xddxdd/bird-lg-go:proxy-develop-mtr
+            ghcr.io/xddxdd/bird-lg-go:proxy-develop-${{ github.sha }}-mtr
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -85,3 +85,16 @@ jobs:
            xddxdd/bird-lgproxy-go:${{ github.event.release.tag_name }}
            ghcr.io/xddxdd/bird-lg-go:proxy
            ghcr.io/xddxdd/bird-lg-go:proxy-${{ github.event.release.tag_name }}
+
+      - name: Build proxy docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: '{{defaultContext}}:proxy'
+          file: 'Dockerfile.mtr'
+          platforms: linux/amd64,linux/arm64,linux/386,linux/arm/v7
+          push: true
+          tags: |
+            xddxdd/bird-lgproxy-go:latest-mtr
+            xddxdd/bird-lgproxy-go:${{ github.event.release.tag_name }}-mtr
+            ghcr.io/xddxdd/bird-lg-go:proxy-mtr
+            ghcr.io/xddxdd/bird-lg-go:proxy-${{ github.event.release.tag_name }}-mtr
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,3 @@ proxy/proxy

 # don't include generated bindata file
 frontend/bindata.go
-
-# don't include generated Dockerfiles
-frontend/Dockerfile.*
-proxy/Dockerfile.*
--- a/README.md
+++ b/README.md
@@ -167,6 +167,7 @@ Example: the following docker-compose.yml entry does the same as above, but by s
 services:
  bird-lgproxy:
    # Use xddxdd/bird-lgproxy-go:develop for the latest build from master branch
+    # Use xddxdd/bird-lgproxy-go:latest-mtr to use MTR instead of Traceroute
    image: xddxdd/bird-lgproxy-go:latest
    container_name: bird-lgproxy
    restart: always
--- a/2
+++ b/2
@@ -1 +1 @@
-v1.3.4
+v1.3.7.1
--- a/frontend/assets/templates/page.tpl
+++ b/frontend/assets/templates/page.tpl
@@ -8,6 +8,19 @@
 <meta name="renderer" content="webkit">
 <title>{{ html .Title }}</title>
 <link rel="stylesheet" href="/static/jsdelivr/npm/bootstrap@4.5.1/dist/css/bootstrap.min.css" integrity="sha256-VoFZSlmyTXsegReQCNmbXrS4hBBUl/cexZvPmPWoJsY=" crossorigin="anonymous">
+<style>
+.navbar-nav {
+	flex-wrap: wrap;
+}
+@media (min-width: 768px) {
+	.navbar form {
+		min-width: 400px;
+	}
+	.nav-link {
+		padding: 0.2rem 0.5rem !important;
+	}
+}
+</style>
 <meta name="robots" content="noindex, nofollow">
 </head>
 <body>
--- a/frontend/go.mod
+++ b/frontend/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/jarcoal/httpmock v1.3.1
 	github.com/magiconair/properties v1.8.7
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.18.0
+	github.com/spf13/viper v1.18.2
 )

 require (
--- a/frontend/go.sum
+++ b/frontend/go.sum
@@ -1576,8 +1576,8 @@ github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0=
 github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.18.0 h1:pN6W1ub/G4OfnM+NR9p7xP9R6TltLUzp5JG9yZD3Qg0=
-github.com/spf13/viper v1.18.0/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk=
+github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ=
+github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
--- a/frontend/render.go
+++ b/frontend/render.go
@@ -193,6 +193,11 @@ func summaryParse(data string, serverName string) (TemplateSummary, error) {
 			row.Info = strings.TrimSpace(lineSplitted[10])
 		}

+		// Dynamic BGP session, show without any color
+		if strings.Contains(row.Info, "Passive") {
+			row.MappedState = summaryStateMap["passive"]
+		}
+
 		// add to the result
 		args.Rows = append(args.Rows, row)
 	}
--- a/proxy/Dockerfile.mtr
+++ b/proxy/Dockerfile.mtr
@@ -0,0 +1,31 @@
+FROM golang AS step_0
+
+ENV CGO_ENABLED=0 GO111MODULE=on
+WORKDIR /root
+COPY . .
+RUN go build -ldflags "-w -s" -o /proxy
+
+################################################################################
+
+FROM alpine:edge AS step_1
+
+WORKDIR /root
+RUN apk add --no-cache build-base linux-headers
+
+RUN wget https://www.bitwizard.nl/mtr/files/mtr-0.94.tar.gz \
+    -O mtr-0.94.tar.gz
+RUN tar xvf mtr-0.94.tar.gz \
+    && cd mtr-0.94 \
+    && ./configure --without-gtk --without-ncurses --without-jansson --without-ipinfo --disable-bash-completion \
+    && make -j4 LDFLAGS="-static" \
+    && strip /root/mtr-0.94/mtr \
+    && strip /root/mtr-0.94/mtr-packet
+
+################################################################################
+
+FROM scratch AS step_2
+ENV PATH=/
+COPY --from=step_0 /proxy /
+COPY --from=step_1 /root/mtr-0.94/mtr /
+COPY --from=step_1 /root/mtr-0.94/mtr-packet /
+ENTRYPOINT ["/proxy"]
--- a/proxy/go.mod
+++ b/proxy/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/gorilla/handlers v1.5.2
 	github.com/magiconair/properties v1.8.7
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.18.0
+	github.com/spf13/viper v1.18.2
 )

 require (
--- a/proxy/go.sum
+++ b/proxy/go.sum
@@ -1572,8 +1572,8 @@ github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0=
 github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.18.0 h1:pN6W1ub/G4OfnM+NR9p7xP9R6TltLUzp5JG9yZD3Qg0=
-github.com/spf13/viper v1.18.0/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk=
+github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ=
+github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
Author	SHA1	Message	Date
Lan Tian	01438edaef	release: v1.3.7.1	2024-03-12 18:05:50 -07:00
Lan Tian	90f36610dc	ci: fix failing whois test	2024-03-12 18:03:23 -07:00
Lan Tian	6174208d07	ci: fix typo in release workflow	2024-03-12 17:56:52 -07:00
Lan Tian	76174cdc08	release: v1.3.7	2024-03-12 17:47:29 -07:00
Lan Tian	088bb6fe5a	readme: add mention of MTR based lgproxy docker image	2024-03-12 17:46:56 -07:00
Lan Tian	3951eed011	ci: fix dockerfile path for proxy image with mtr	2024-03-09 12:21:00 -08:00
Lan Tian	91c0a8962b	ci: also test mtr binary in proxy image	2024-03-09 12:09:19 -08:00
Lan Tian	5f7850a903	ci: also build docker image with mtr on regular commits	2024-03-09 12:05:20 -08:00
Lan Tian	6a78cf2e80	proxy: add docker image with mtr	2024-03-09 12:04:05 -08:00
Lan Tian	5b5a44bcb6	release: v1.3.6	2024-02-25 19:47:39 -08:00
Marc 'risson' Schmitt	ac31862237	frontend: show dynamic BGP sessions without any color (#98 ) Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>	2024-02-18 22:11:20 -08:00
Lan Tian	86129190ab	release: v1.3.5	2024-01-01 14:43:25 -08:00
Lan Tian	ff55064a20	frontend: adjust navbar display of many servers	2023-12-31 16:31:56 -08:00
dependabot[bot]	dbb02c04ed	Merge pull request #95 from xddxdd/dependabot/go_modules/proxy/github.com/spf13/viper-1.18.2	2023-12-19 00:50:09 +00:00
dependabot[bot]	c2b7de2e17	build(deps): bump github.com/spf13/viper from 1.18.1 to 1.18.2 in /proxy Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.18.1 to 1.18.2. - [Release notes](https://github.com/spf13/viper/releases) - [Commits](https://github.com/spf13/viper/compare/v1.18.1...v1.18.2) --- updated-dependencies: - dependency-name: github.com/spf13/viper dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-12-19 00:48:47 +00:00
dependabot[bot]	c1b578e8db	Merge pull request #94 from xddxdd/dependabot/go_modules/frontend/github.com/spf13/viper-1.18.2	2023-12-19 00:28:10 +00:00
dependabot[bot]	7b0e5689d4	build(deps): bump github.com/spf13/viper in /frontend Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.18.1 to 1.18.2. - [Release notes](https://github.com/spf13/viper/releases) - [Commits](https://github.com/spf13/viper/compare/v1.18.1...v1.18.2) --- updated-dependencies: - dependency-name: github.com/spf13/viper dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-12-19 00:26:13 +00:00
dependabot[bot]	3c46bda49d	Merge pull request #93 from xddxdd/dependabot/go_modules/frontend/github.com/spf13/viper-1.18.1	2023-12-11 00:45:58 +00:00
dependabot[bot]	32e00d2ce3	build(deps): bump github.com/spf13/viper in /frontend Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.18.0 to 1.18.1. - [Release notes](https://github.com/spf13/viper/releases) - [Commits](https://github.com/spf13/viper/compare/v1.18.0...v1.18.1) --- updated-dependencies: - dependency-name: github.com/spf13/viper dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-12-11 00:44:41 +00:00
dependabot[bot]	a19750cdef	Merge pull request #92 from xddxdd/dependabot/go_modules/proxy/github.com/spf13/viper-1.18.1	2023-12-11 00:04:27 +00:00
dependabot[bot]	7f1cdaa4ee	build(deps): bump github.com/spf13/viper from 1.18.0 to 1.18.1 in /proxy Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.18.0 to 1.18.1. - [Release notes](https://github.com/spf13/viper/releases) - [Commits](https://github.com/spf13/viper/compare/v1.18.0...v1.18.1) --- updated-dependencies: - dependency-name: github.com/spf13/viper dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-12-11 00:03:09 +00:00