Skip to content

Commit b606b62

Browse files
authored
chore: migrate from master to main (#778)
1 parent 5c2b14b commit b606b62

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
[![GitHub release](https://img.shields.io/github/release/aquasecurity/trivy.svg)](https://github.com/aquasecurity/trivy/releases/latest)
55
[![CircleCI](https://circleci.com/gh/aquasecurity/trivy.svg?style=svg)](https://circleci.com/gh/aquasecurity/trivy)
66
[![Go Report Card](https://goreportcard.com/badge/github.com/aquasecurity/trivy)](https://goreportcard.com/report/github.com/aquasecurity/trivy)
7-
[![License: Apache-2.0](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/aquasecurity/trivy/blob/master/LICENSE)
7+
[![License: Apache-2.0](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/aquasecurity/trivy/blob/main/LICENSE)
88
[![Docker image](https://images.microbadger.com/badges/version/aquasec/trivy.svg)](https://microbadger.com/images/aquasec/trivy "Get your own version badge on microbadger.com")
9-
[![codecov](https://codecov.io/gh/aquasecurity/trivy/branch/master/graph/badge.svg)](https://codecov.io/gh/aquasecurity/trivy)
9+
[![codecov](https://codecov.io/gh/aquasecurity/trivy/branch/main/graph/badge.svg)](https://codecov.io/gh/aquasecurity/trivy)
1010

1111
A Simple and Comprehensive Vulnerability Scanner for Containers and other Artifacts, Suitable for CI.
1212

@@ -126,7 +126,7 @@ See [here](#continuous-integration-ci) for details.
126126
- local filesystem
127127
- remote git repository
128128

129-
Please see [LICENSE](https://github.com/aquasecurity/trivy/blob/master/LICENSE) for Trivy licensing information. Note that Trivy uses vulnerability information from a variety of sources, some of which are licensed for non-commercial use only.
129+
Please see [LICENSE](https://github.com/aquasecurity/trivy/blob/main/LICENSE) for Trivy licensing information. Note that Trivy uses vulnerability information from a variety of sources, some of which are licensed for non-commercial use only.
130130

131131
# Installation
132132

@@ -209,7 +209,7 @@ Or through your configuration on NixOS or with home-manager as usual
209209
This script downloads Trivy binary based on your OS and architecture.
210210

211211
```
212-
$ curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/master/contrib/install.sh | sh -s -- -b /usr/local/bin
212+
$ curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin
213213
```
214214

215215
## Binary
@@ -333,7 +333,7 @@ Scan your container from inside the container.
333333

334334
```
335335
$ docker run --rm -it alpine:3.11
336-
/ # curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/master/contrib/install.sh | sh -s -- -b /usr/local/bin
336+
/ # curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin
337337
/ # trivy fs /
338338
```
339339

@@ -345,7 +345,7 @@ $ cat Dockerfile
345345
FROM alpine:3.7
346346
347347
RUN apk add curl \
348-
&& curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/master/contrib/install.sh | sh -s -- -b /usr/local/bin \
348+
&& curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin \
349349
&& trivy filesystem --exit-code 1 --no-progress /
350350
351351
$ docker build -t vulnerable-image .
@@ -644,7 +644,7 @@ $ trivy image --input /path/to/alpine
644644

645645
```
646646
$ docker run --rm -it alpine:3.10.2
647-
/ # curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/master/contrib/install.sh | sh -s -- -b /usr/local/bin
647+
/ # curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin
648648
/ # trivy fs /
649649
```
650650

@@ -729,7 +729,7 @@ $ cat Dockerfile
729729
FROM alpine:3.7
730730
731731
RUN apk add curl \
732-
&& curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/master/contrib/install.sh | sh -s -- -b /usr/local/bin \
732+
&& curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin \
733733
&& trivy filesystem --exit-code 1 --no-progress /
734734
735735
$ docker build -t vulnerable-image .
@@ -742,7 +742,7 @@ $ docker build -t vulnerable-image .
742742
Sending build context to Docker daemon 31.14MB
743743
Step 1/2 : FROM alpine:3.7
744744
---> 6d1ef012b567
745-
Step 2/2 : RUN curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/master/contrib/install.sh | sh -s -- -b /usr/local/bin && trivy filesystem --exit-code 1 --no-progress /
745+
Step 2/2 : RUN curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin && trivy filesystem --exit-code 1 --no-progress /
746746
---> Running in 27b004205da0
747747
2020-06-01T14:10:41.261Z INFO Need to update DB
748748
2020-06-01T14:10:41.262Z INFO Downloading DB...
@@ -1688,7 +1688,7 @@ Distroless: https://github.com/GoogleContainerTools/distroless
16881688

16891689
The path of these files does not matter.
16901690

1691-
Example: https://github.com/aquasecurity/trivy-ci-test/blob/master/Dockerfile
1691+
Example: https://github.com/aquasecurity/trivy-ci-test/blob/main/Dockerfile
16921692

16931693
## Image Tar format
16941694
Trivy scans a tar image with the following format.
@@ -1856,7 +1856,7 @@ However, the purpose of this database is to make it possible to know what packag
18561856
As README says, it is not a complete database of all security issues in Alpine.
18571857

18581858
`Trivy` collects vulnerability information in Alpine Linux from [Alpine Linux aports repository](https://gitlab.alpinelinux.org/alpine/aports).
1859-
Then, those vulnerabilities will be saved on [vuln-list](https://github.com/aquasecurity/vuln-list/tree/master/alpine).
1859+
Then, those vulnerabilities will be saved on [vuln-list](https://github.com/aquasecurity/vuln-list/tree/main/alpine).
18601860

18611861
`alpine-secdb` has 6959 vulnerabilities (as of 2019/05/12).
18621862
`vuln-list` has 11101 vulnerabilities related to Alpine Linux (as of 2019/05/12).

ci/deploy-deb.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ done
1919

2020
git add .
2121
git commit -m "Update deb packages"
22-
git push origin master
22+
git push origin main

ci/deploy-rpm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ done
2323

2424
git add .
2525
git commit -m "Update rpm packages"
26-
git push origin master
26+
git push origin main
2727

contrib/Trivy.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Trivy_container_scanning:
1313
- export TRIVY_VERSION=${TRIVY_VERSION:-v0.4.3}
1414
- apk add --no-cache curl docker-cli
1515
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
16-
- curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/master/contrib/install.sh | sh -s -- -b /usr/local/bin ${TRIVY_VERSION}
16+
- curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin ${TRIVY_VERSION}
1717
- curl -sSL -o /tmp/trivy-gitlab.tpl https://github.com/aquasecurity/trivy/raw/${TRIVY_VERSION}/contrib/gitlab.tpl
1818
script:
1919
- trivy --exit-code 0 --cache-dir .trivycache/ --no-progress --format template --template "@/tmp/trivy-gitlab.tpl" -o gl-container-scanning-report.json $IMAGE

0 commit comments

Comments
 (0)