github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-05-11 17:36:17 +00:00
Code Issues Projects Releases Wiki Activity
1,428 Commits 17 Branches 100 Tags 84 MiB
release-1.1
Commit Graph

1428 Commits

Author SHA1 Message Date
Daniel J Walsh
fcc57b1fa7
Merge pull request from vrothberg/1.1.1 
v1.1.1
 2020-07-29 07:56:19 -04:00
Valentin Rothberg
13c69d48fa bump to v1.1.2-dev 
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
 2020-07-29 11:06:46 +02:00
Valentin Rothberg
67abbb3cef v1.1.1 
* Run htpasswd from our build-container instead of registry:2
 * vendor golang.org/x/text@v0.3.3

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
 2020-07-29 11:06:18 +02:00
Miloslav Trmač
747abd054f
Merge pull request from mtrmac/htpasswd-1.1 
Run htpasswd from our build-container instead of registry:2
 2020-07-16 20:20:36 +02:00
Miloslav Trmač
8a664856cd Run htpasswd from our build-container instead of registry:2 
registry:2 no longer contains htpasswd.

Also don't use log_and_run ... >> $file
because that will cause the command to be logged to $file.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
 2020-07-16 19:09:51 +02:00
Daniel J Walsh
3f81ee46c3
Merge pull request from vrothberg/1.1-update-x/text 
[1.1] vendor golang.org/x/text@v0.3.3
 2020-07-16 13:05:55 -04:00
Valentin Rothberg
14ba92b2f6 vendor golang.org/x/text@v0.3.3 
Fixes: CVE-2020-14040
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
 2020-07-16 11:23:08 +02:00
Daniel J Walsh
63085f5bef
Bump to v1.1.0 
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
 2020-06-17 16:41:19 -04:00
Miloslav Trmač
091f9248dc
Merge pull request from vrothberg/vendor-image 
vendor github.com/containers/image/v5@v5.5.1
 2020-06-17 18:24:01 +02:00
Valentin Rothberg
dd7dd75334 vendor github.com/containers/image/v5@v5.5.1 
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
 2020-06-17 17:25:15 +02:00
Valentin Rothberg
b70dfae2ae vendor github.com/containers/common v0.14.0 
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
 2020-06-17 09:55:53 +02:00
Daniel J Walsh
0bd78a0604
Merge pull request from containers/dependabot/go_modules/github.com/stretchr/testify-1.6.1 
Bump github.com/stretchr/testify from 1.6.0 to 1.6.1
 2020-06-16 05:35:48 -04:00
Daniel J Walsh
9e0839c33f
Merge pull request from containers/dependabot/go_modules/github.com/containers/common-0.13.1 
Bump github.com/containers/common from 0.13.0 to 0.13.1
 2020-06-16 05:34:09 -04:00
dependabot-preview[bot]
9bafa7e80d
Bump github.com/containers/common from 0.13.0 to 0.13.1 
Bumps [github.com/containers/common](https://github.com/containers/common) from 0.13.0 to 0.13.1.
- [Release notes](https://github.com/containers/common/releases)
- [Commits](https://github.com/containers/common/compare/v0.13.0...v0.13.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
 2020-06-15 09:06:14 -04:00
Daniel J Walsh
827293a13b
Merge pull request from yuhuijiang/patch-1 
Correct a typo in docs/skopeo-sync.1.md
 2020-06-11 15:04:35 -04:00
Yuhui Jiang
6198daeb2c
Correct a typo in docs/skopeo-sync.1.md 
To disable TLS verification need to set "tls-verify" to "false"
 2020-06-11 01:29:37 +08:00
Miloslav Trmač
161ef5a224
Merge pull request from containers/dependabot/go_modules/github.com/containers/common-0.13.0 
Bump github.com/containers/common from 0.12.0 to 0.13.0
 2020-06-09 21:18:10 +02:00
dependabot-preview[bot]
9e99ad99d4
Bump github.com/containers/common from 0.12.0 to 0.13.0 
Bumps [github.com/containers/common](https://github.com/containers/common) from 0.12.0 to 0.13.0.
- [Release notes](https://github.com/containers/common/releases)
- [Commits](https://github.com/containers/common/compare/v0.12.0...v0.13.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
 2020-06-09 10:59:38 -04:00
dependabot-preview[bot]
c36502ce31
Bump github.com/stretchr/testify from 1.6.0 to 1.6.1 
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.6.0 to 1.6.1.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](https://github.com/stretchr/testify/compare/v1.6.0...v1.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
 2020-06-08 16:10:50 -04:00
Daniel J Walsh
f9b0d93ee0
Merge pull request from containers/dependabot/go_modules/github.com/containers/storage-1.20.2 
Bump github.com/containers/storage from 1.20.1 to 1.20.2
 2020-06-04 16:07:53 -04:00
dependabot-preview[bot]
4eaaf31249
Bump github.com/containers/storage from 1.20.1 to 1.20.2 
Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.20.1 to 1.20.2.
- [Release notes](https://github.com/containers/storage/releases)
- [Changelog](https://github.com/containers/storage/blob/master/docs/containers-storage-changes.md)
- [Commits](https://github.com/containers/storage/compare/v1.20.1...v1.20.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
 2020-06-04 08:36:51 -04:00
Daniel J Walsh
c6b488a82c
Merge pull request from containers/dependabot/go_modules/github.com/containers/common-0.12.0 
Bump github.com/containers/common from 0.11.4 to 0.12.0
 2020-05-29 09:02:18 -04:00
Daniel J Walsh
7cfc62922f
Merge pull request from containers/dependabot/go_modules/github.com/stretchr/testify-1.6.0 
Bump github.com/stretchr/testify from 1.5.1 to 1.6.0
 2020-05-29 09:01:55 -04:00
dependabot-preview[bot]
5284f6d832
Bump github.com/stretchr/testify from 1.5.1 to 1.6.0 
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.5.1 to 1.6.0.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](https://github.com/stretchr/testify/compare/v1.5.1...v1.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
 2020-05-29 05:56:22 -04:00
dependabot-preview[bot]
ae97c667e3
Bump github.com/containers/common from 0.11.4 to 0.12.0 
Bumps [github.com/containers/common](https://github.com/containers/common) from 0.11.4 to 0.12.0.
- [Release notes](https://github.com/containers/common/releases)
- [Commits](https://github.com/containers/common/compare/v0.11.4...v0.12.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
 2020-05-29 05:55:57 -04:00
Miloslav Trmač
a2c1d46302
Merge pull request from TomSweeneyRedHat/dev/tsweeney/skopeoimage2 
Add upstream and testing container images
 2020-05-25 17:42:30 +02:00
Miloslav Trmač
8b4b954332 Fix error handling on invalid regex 
Say that the regex is the cause, include it in the error message,
and don't continue as if the compilation succeeded.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
 2020-05-25 11:58:19 +02:00
Miloslav Trmač
c103d65284 Drop redundant fmt.Sprintf inside erorrs.Wrapf/Errorf 
Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
 2020-05-25 11:58:19 +02:00
Miloslav Trmač
c5183d0e34 Use MatchString instead of Match with a manual conversion 
Should not change behavior AFAICT.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
 2020-05-25 11:58:19 +02:00
Miloslav Trmač
16b435257b Use reference.Tagged to extract the tag from a reference 
... instead of manually parsing strings.

Should not change behavior, except maybe error messages if the
registry returns invalid tags.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
 2020-05-25 11:58:19 +02:00
Miloslav Trmač
35f3595d02 Inline isTagSpecified into its only caller 
We already parsed the input string in the caller,
so this is much simpler.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
 2020-05-25 11:58:19 +02:00
Miloslav Trmač
0ee81dc9fe Use a reference.Named, not types.ImageReference, in imagesToCopy 
This removes another string formatting use, and removes the
last recently introduced docker.Reference->reference.Named
redundancy.

Should not change behavior, apart from error messages.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
 2020-05-25 11:58:19 +02:00
Miloslav Trmač
805885091f Clarify imagesToCopy control flow 
... and remove one duplicate line.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
 2020-05-25 11:58:19 +02:00
Miloslav Trmač
97ec6873fa Work with a reference.Named, not strings, in imagesToCopyFromRegistry 
We now notice earlier if the user uses a non-repository input.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
 2020-05-25 11:58:19 +02:00
Miloslav Trmač
d16cd39939 Use a reference.Named, not types.ImageReference, in imagesToCopyFromRepo 
Right now that only complicates code by going through a
types.ImageReference->reference.Named->types.ImageReference sequence,
but that will change as we modify the callers as well.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
 2020-05-25 11:58:19 +02:00
Miloslav Trmač
7439f94e22 Remove the repoReference parameter of imagesToCopyFromRepo 
It is redundant, only used to form a tagged reference,
which can be done more safely using reference.WithTag.

Also move the *types.SystemContext parameter to the front,
as is usual.

Should not change behavior, apart from a few error messages.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
 2020-05-25 11:58:19 +02:00
Miloslav Trmač
443380731e Don't use path.Join to form repository names 
path.Join runs path.Clean, which interprets / and . and .. .

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
 2020-05-25 11:58:19 +02:00
Miloslav Trmač
56c6325ba0 Share the logrus.WithFields settings over the loop bodies 
to avoid the maddening repetitivenes.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
 2020-05-25 11:58:19 +02:00
Miloslav Trmač
0ae9db5dd6 Clarify control flow when handling the tags list 
Don't run the the "tags specified" loop when
tags should be discovered.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
 2020-05-25 11:58:19 +02:00
Miloslav Trmač
677c29bf24 Only create a SystemContext once per registry 
... because it does not change with each repository.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
 2020-05-25 11:58:19 +02:00
Miloslav Trmač
72376c4144 Fix the recently added example in the man page. 
- Improve the language
- Be consistent with the previous example about a trailing slash
- Don't unnecessarily quote :, it is not a shell metacharacter.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
 2020-05-25 11:58:19 +02:00
Miloslav Trmač
322625eeca Use a separate field for the "sync images with tag matching regex" feature 
Fields that magically change their behavior depending on type of the value
are too much hassle for no benefit.

For now, this just copies&pastes the full loop in imagesToCopyFromRegistry
to create another loop handling the new ImagesByTagRegex field. Simplifications
to reduce duplication will follow.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
 2020-05-25 11:58:19 +02:00
TomSweeneyRedHat
9c1936fd07 Add upstream and testing container images 
This PR adds the Dockerfiles necessary to create the upstream
and testing variants of the Skopeo container images that will
reside in quay.io/skopeo/upstream and quay.io/skopeo/testing
repositories.  The only difference in the Dockerfile between
the stable and testing image is the option `--enablerepo updates-testing`
was added.  The testing variant is relatively the same, but
I'd to clone and install Skopeo in the container.

I've also added a README.md which explains all of the varities
of images and includes some sample usage.

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
 2020-05-23 18:04:49 -04:00
Daniel J Walsh
3a94432e42
Merge pull request from containers/dependabot/go_modules/github.com/containers/storage-1.20.1 
Bump github.com/containers/storage from 1.19.2 to 1.20.1
 2020-05-23 05:53:22 -04:00
Daniel J Walsh
ce1f807aa0
Merge pull request from containers/dependabot/go_modules/github.com/containers/common-0.11.4 
Bump github.com/containers/common from 0.11.2 to 0.11.4
 2020-05-23 05:52:59 -04:00
dependabot-preview[bot]
a51af64dd9
Bump github.com/containers/storage from 1.19.2 to 1.20.1 
Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.19.2 to 1.20.1.
- [Release notes](https://github.com/containers/storage/releases)
- [Changelog](https://github.com/containers/storage/blob/master/docs/containers-storage-changes.md)
- [Commits](https://github.com/containers/storage/compare/v1.19.2...v1.20.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
 2020-05-22 13:36:27 -04:00
dependabot-preview[bot]
a31d6069dc
Bump github.com/containers/common from 0.11.2 to 0.11.4 
Bumps [github.com/containers/common](https://github.com/containers/common) from 0.11.2 to 0.11.4.
- [Release notes](https://github.com/containers/common/releases)
- [Commits](https://github.com/containers/common/compare/v0.11.2...v0.11.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
 2020-05-22 13:35:57 -04:00
Miloslav Trmač
96353f2b64
Merge pull request from GETandSELECT/master 
there is a brew formula for skopeo
 2020-05-21 19:14:34 +02:00
Kargins
2330455c8d
there is a brew formula for skopeo 2020-05-21 07:56:35 +02:00
Daniel J Walsh
91a88de6a1
Merge pull request from TomSweeneyRedHat/dev/tsweeney/quay 
Add Skopeo Stable Image Dockerfile for Quay
 2020-05-20 12:53:30 -04:00