From 6b007c70c74e042af1abe9cdb69c792336899b71 Mon Sep 17 00:00:00 2001 From: Yulia Gaponenko Date: Thu, 19 Nov 2020 11:18:24 +0100 Subject: [PATCH 1/2] Add information about multi-arch image to README Also update to the correct one information about required env variables for multi-arch build Signed-off-by: Yulia Gaponenko --- contrib/skopeoimage/README.md | 7 +++++++ release/README.md | 9 +++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/contrib/skopeoimage/README.md b/contrib/skopeoimage/README.md index 1cd71ae5..835a51dc 100644 --- a/contrib/skopeoimage/README.md +++ b/contrib/skopeoimage/README.md @@ -16,6 +16,13 @@ using the latest Fedora and then Skopeo is installed into them: * quay.io/skopeo/upstream - This image is built using the latest code found in this GitHub repository. When someone creates a commit and pushes it, the image is created. Due to that the image changes frequently and is not guaranteed to be stable. Built with skopeoimage/upstream/Dockerfile. * quay.io/skopeo/testing - This image is built using the latest version of Skopeo that is or was in updates testing for Fedora. At times this may be the same as the stable image. This container image will primarily be used by the development teams for verification testing when a new package is created. Built with skopeoimage/testing/Dockerfile. +## Multiarch images + +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. + ## Sample Usage Although not required, it is suggested that [Podman](https://github.com/containers/podman) be used with these container images. diff --git a/release/README.md b/release/README.md index 06209838..0a5da599 100644 --- a/release/README.md +++ b/release/README.md @@ -22,12 +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. -- `QUAY_USERNAME` and `QUAY_PASSWORD` are credentials to push image to corresponding quay.io repositories, 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, 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). 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 image name to publish upstream skopeo. ### Values for environment variables @@ -36,4 +37,4 @@ Variables in .travis.yml | MULTIARCH_MANIFEST_ARCHITECTURES | "amd64 s390x ppc64le" | | STABLE_IMAGE | quay.io/skopeo/stable:v1.2.0 | | EXTRA_STABLE_IMAGE | quay.io/containers/skopeo:v1.2.0 | -| UPSTREAM_IMAGE | quay.io/skopeo/upstream:master | +| UPSTREAM_IMAGE | quay.io/skopeo/upstream:master | From 4b4ad6285e359a905241765f5aa83461110b7462 Mon Sep 17 00:00:00 2001 From: Yulia Gaponenko Date: Thu, 19 Nov 2020 18:20:53 +0100 Subject: [PATCH 2/2] Fix naming and language - rename skopeo to Skopeo - improve language Co-authored-by: Tom Sweeney --- contrib/skopeoimage/README.md | 4 ++-- release/README.md | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/skopeoimage/README.md b/contrib/skopeoimage/README.md index 835a51dc..fec9b649 100644 --- a/contrib/skopeoimage/README.md +++ b/contrib/skopeoimage/README.md @@ -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 diff --git a/release/README.md b/release/README.md index 0a5da599..dac92098 100644 --- a/release/README.md +++ b/release/README.md @@ -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