diff --git a/README.md b/README.md index d85dfe4f..bba577c0 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ -skopeo [![Build Status](https://travis-ci.org/containers/skopeo.svg?branch=master)](https://travis-ci.org/containers/skopeo) + - + ---- diff --git a/contrib/skopeoimage/README.md b/contrib/skopeoimage/README.md index f4eb53b9..3bdbfb76 100644 --- a/contrib/skopeoimage/README.md +++ b/contrib/skopeoimage/README.md @@ -11,7 +11,7 @@ [comment]: <> () [comment]: <> (***ATTENTION*** ***WARNING*** ***ALERT*** ***CAUTION*** ***DANGER***) - + ---- diff --git a/docs/skopeo.1.md b/docs/skopeo.1.md index 4421a476..e6de6652 100644 --- a/docs/skopeo.1.md +++ b/docs/skopeo.1.md @@ -47,7 +47,7 @@ Most commands refer to container images, using a _transport_`:`_details_ format. **oci-archive:**_path_**:**_tag_ An image _tag_ in a tar archive compliant with "Open Container Image Layout Specification" at _path_. -See [containers-transports(5)](https://github.com/containers/image/blob/master/docs/containers-transports.5.md) for details. +See [containers-transports(5)](https://github.com/containers/image/blob/main/docs/containers-transports.5.md) for details. ## OPTIONS @@ -113,11 +113,11 @@ Print the version number ## FILES **/etc/containers/policy.json** Default trust policy file, if **--policy** is not specified. - The policy format is documented in [containers-policy.json(5)](https://github.com/containers/image/blob/master/docs/containers-policy.json.5.md) . + The policy format is documented in [containers-policy.json(5)](https://github.com/containers/image/blob/main/docs/containers-policy.json.5.md) . **/etc/containers/registries.d** Default directory containing registry configuration, if **--registries.d** is not specified. - The contents of this directory are documented in [containers-policy.json(5)](https://github.com/containers/image/blob/master/docs/containers-policy.json.5.md). + The contents of this directory are documented in [containers-policy.json(5)](https://github.com/containers/image/blob/main/docs/containers-policy.json.5.md). ## SEE ALSO skopeo-login(1), docker-login(1), containers-auth.json(5), containers-storage.conf(5), containers-policy.json(5), containers-transports(5) diff --git a/integration/utils.go b/integration/utils.go index 64705b49..44fee496 100644 --- a/integration/utils.go +++ b/integration/utils.go @@ -19,7 +19,7 @@ const decompressDirsBinary = "./decompress-dirs.sh" const testFQIN = "docker://quay.io/libpod/busybox" // tag left off on purpose, some tests need to add a special one const testFQIN64 = "docker://quay.io/libpod/busybox:amd64" -const testFQINMultiLayer = "docker://quay.io/libpod/alpine_nginx:master" // multi-layer +const testFQINMultiLayer = "docker://quay.io/libpod/alpine_nginx:latest" // multi-layer // consumeAndLogOutputStream takes (f, err) from an exec.*Pipe(), and causes all output to it to be logged to c. func consumeAndLogOutputStream(c *check.C, id string, f io.ReadCloser, err error) {