Skip to content

Commit

Permalink
Fix naming and language
Browse files Browse the repository at this point in the history
- rename skopeo to Skopeo
- improve language

Co-authored-by: Tom Sweeney <[email protected]>
  • Loading branch information
barthy1 and TomSweeneyRedHat committed Nov 19, 2020
1 parent 6b007c7 commit 4b4ad62
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions contrib/skopeoimage/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ using the latest Fedora and then Skopeo is installed into them:

## Multiarch images

Multiarch images are available for skopeo upstream and stable versions. Supported architectures are `amd64`, `s390x`, `ppc64le`.
Multiarch images are available for Skopeo upstream and stable versions. Supported architectures are `amd64`, `s390x`, `ppc64le`.
Available images are `quay.io/skopeo/upstream:master`, `quay.io/skopeo/stable:v1.2.0`, `quay.io/containers/skopeo:v1.2.0`.

Images can be used the same way as in single architecture case, no extra setup is required. For samples see next chapter.
Images can be used the same way as in a single architecture case, no extra setup is required. For samples see next chapter.

## Sample Usage

Expand Down
8 changes: 4 additions & 4 deletions release/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ Several environment variables are used to customize image names and keep private

**Image tags** are specified in environment variable and should be manually updated in case of new release.

- `SKOPEO_QUAY_USERNAME` and `SKOPEO_QUAY_PASSWORD` are credentials to push images to `quay.io/skopeo/stable` and `quay.io/skopeo/upstream` repos, should have write permissions. These variables should be specified in [Travis](https://docs.travis-ci.com/user/environment-variables/#defining-variables-in-repository-settings).
- `CONTAINERS_QUAY_USERNAME` and `CONTAINERS_QUAY_PASSWORD` are credentials to push image to `quay.io/containers/skopeo` repo, should have write permissions. These variables should be specified in [Travis](https://docs.travis-ci.com/user/environment-variables/#defining-variables-in-repository-settings).
- `SKOPEO_QUAY_USERNAME` and `SKOPEO_QUAY_PASSWORD` are credentials to push images to `quay.io/skopeo/stable` and `quay.io/skopeo/upstream` repos, and require the credentials to have write permissions. These variables should be specified in [Travis](https://docs.travis-ci.com/user/environment-variables/#defining-variables-in-repository-settings).
- `CONTAINERS_QUAY_USERNAME` and `CONTAINERS_QUAY_PASSWORD` are credentials to push images to `quay.io/containers/skopeo` repos, and require the credentials to have write permissions. These variables should be specified in [Travis](https://docs.travis-ci.com/user/environment-variables/#defining-variables-in-repository-settings).

Variables in .travis.yml
- `MULTIARCH_MANIFEST_ARCHITECTURES` is a list with architecture shortnames, to apprear in final multiarch manifest. The values should fit to architectures used in the `image-build-push` Travis step.
- `STABLE_IMAGE`, `EXTRA_STABLE_IMAGE` are image names to publish stable skopeo.
- `UPSTREAM_IMAGE` is image name to publish upstream skopeo.
- `STABLE_IMAGE`, `EXTRA_STABLE_IMAGE` are image names to publish stable Skopeo.
- `UPSTREAM_IMAGE` is an image name to publish upstream Skopeo.

### Values for environment variables

Expand Down

0 comments on commit 4b4ad62

Please sign in to comment.