apigee · srinandan · Jan 21, 2025 · Jan 21, 2025 · Jan 21, 2025
diff --git a/.github/workflows/gen-docs.yml b/.github/workflows/gen-docs.yml
@@ -51,11 +51,12 @@ jobs:
           git checkout gh_pages
           git merge -X theirs origin/main --allow-unrelated-histories
 
-          GOBIN=/tmp/ go install github.com/google/go-licenses@v1.0.0
-          /tmp/go-licenses csv ./cmd/apigeecli > third-party-licenses.txt || echo "Ignore warnings"
-          /tmp/go-licenses save ./cmd/apigeecli --save_path=third-party --force || echo "Ignore warnings"
+          GOBIN=/tmp/ go install github.com/google/go-licenses@v1.6.0
+          /tmp/go-licenses report ./... --template licenses.tpl --ignore internal > third-party-licenses.txt 2> /dev/null || echo "Ignore warnings"
+          # /tmp/go-licenses save ./cmd/apigeecli --save_path=third-party --force || echo "Ignore warnings"
 
-          git add third-party third-party-licenses.txt
+          # git add third-party third-party-licenses.txt
+          git add third-party-licenses.txt
           git commit -m "generate licenses - $SHORT_SHA" || echo "No Changes in license"
 
           go run docs/docs.go

diff --git a/.github/workflows/licenses.tpl b/.github/workflows/licenses.tpl
@@ -0,0 +1,11 @@
+{{ range . }}
+## {{ .Name }}
+
+* Name: {{ .Name }}
+* Version: {{ .Version }}
+* License: [{{ .LicenseName }}]({{ .LicenseURL }})
+
+```
+{{ .LicenseText }}
+```
+{{ end }}
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -63,6 +63,7 @@ archives:
     wrap_in_directory: true
     files:
       - LICENSE.txt
+      - third-party-licenses.txt
     builds:
       - apigeecli
 

diff --git a/Dockerfile b/Dockerfile
@@ -27,8 +27,7 @@ WORKDIR /go/src/apigeecli
 ENV GO111MODULE=on
 RUN go mod tidy
 RUN go mod download
-RUN date +%FT%H:%I:%M+%Z > /tmp/date
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -trimpath -buildvcs=true -a -gcflags='all="-l"' -ldflags='-s -w -extldflags "-static" -X main.version='${TAG}' -X main.commit='${COMMIT}' -X main.date='$(cat /tmp/date) -o /go/bin/apigeecli /go/src/apigeecli/cmd/apigeecli/apigeecli.go
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -trimpath -buildvcs=true -a -gcflags='all="-l"' -ldflags='-s -w -extldflags "-static" -X main.version='${TAG}' -X main.commit='${COMMIT}' -X main.date='$(date +%FT%H:%I:%M+%Z) -o /go/bin/apigeecli /go/src/apigeecli/cmd/apigeecli/apigeecli.go
 
 FROM ghcr.io/jqlang/jq:1.7.1@sha256:096b83865ad59b5b02841f103f83f45c51318394331bf1995e187ea3be937432 AS jq
 

diff --git a/third-party/LICENSE.txt b/third-party/LICENSE.txt