feat(deb): add common dist (#37)

Co-authored-by: Teppei Fukuda <[email protected]>
aquasecurity · May 2, 2024 · 66745ff · 66745ff
1 parent c3712c7
commit 66745ff
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -4,15 +4,13 @@ deb/rpm repository for Trivy
 ## Debian/Ubuntu
 
 ```
-$ sudo apt-get install apt-transport-https
-$ wget -qO - https://aquasecurity.github.io/trivy-repo/deb/public.key | sudo apt-key add -
-$ echo deb https://aquasecurity.github.io/trivy-repo/deb [CODE_NAME] main | sudo tee -a /etc/apt/sources.list
+$ sudo apt-get install wget apt-transport-https gnupg
+$ wget -qO - https://aquasecurity.github.io/trivy-repo/deb/public.key | gpg --dearmor | sudo tee /usr/share/keyrings/trivy.gpg > /dev/null
+$ echo "deb [signed-by=/usr/share/keyrings/trivy.gpg] https://aquasecurity.github.io/trivy-repo/deb generic main" | sudo tee -a /etc/apt/sources.list.d/trivy.list
 $ sudo apt-get update
 $ sudo apt-get install trivy
 ```
 
-CODE_NAME: wheezy, jessie, stretch, buster, trusty, xenial, bionic
-
 ## RHEL/CentOS
 
 Add repository setting

diff --git a/deb/conf/distributions b/deb/conf/distributions
@@ -133,3 +133,11 @@ Architectures: i386 amd64 arm64
 Components: main
 Description: Trivy repository
 SignWith: 2E2D3567461632C84BB6CD6FE9D0A3616276FA6C
+
+Origin: aquasecurity.github.io/trivy-repo/deb
+Label: github.io/aquasecurity
+Codename: generic
+Architectures: i386 amd64 arm64
+Components: main
+Description: Trivy repository
+SignWith: 2E2D3567461632C84BB6CD6FE9D0A3616276FA6C