From 8672c0fc088fa0210ceaceae0fa1e392dabe6b6e Mon Sep 17 00:00:00 2001 From: Sunjay Bhatia Date: Mon, 23 Mar 2020 13:05:03 -0400 Subject: [PATCH] bump dockerapplifecycle toml image libtrust ocicrypt storage distribution compress pgzip image-spec xz Submodule src/code.cloudfoundry.org/dockerapplifecycle 4d909ee2..ed3c37b3: > Updates for compilation with latest versions of dependencies Submodule src/github.com/BurntSushi/toml 000000000...3012a1dbe (new submodule) Submodule src/github.com/containers/image 495da41bd..4276a4ff6: > v5.3.0 > Merge pull request #854 from mtrmac/arch-variant > Merge pull request #820 from nalind/manifest-list-retry-using-conversions > Merge pull request #853 from mtrmac/docker-tarfile-crash > Update containers/storage to v1.16.5 > oci manifest: do not require whitelist of layer types > Deprecate SupportsEncryption call in manifest interface > Merge pull request #829 from yihuaf/dev/yihuaf/authfile > Merge pull request #849 from containers/dependabot/go_modules/github.com/klauspost/pgzip-1.2.2 > Merge pull request #848 from rhatdan/readme > Merge pull request #836 from lumjjb/change_updated_image > containers-registries.conf.d: refine semantics > Merge pull request #845 from containers/dependabot/go_modules/github.com/containers/storage-1.16.3 > Merge pull request #842 from knqyf263/add_registry_token > Merge pull request #846 from containers/dependabot/go_modules/github.com/klauspost/compress-1.10.3 > Merge pull request #847 from containers/dependabot/go_modules/github.com/opencontainers/selinux-1.4.0 > Merge pull request #831 from kandaaaaa/master > Bump github.com/containers/storage from 1.16.1 to 1.16.2 > Bump github.com/vbauerster/mpb/v4 from 4.12.1 to 4.12.2 > Merge pull request #793 from vrothberg/rewrite-message > Merge pull request #821 from TomSweeneyRedHat/dev/tsweeney/authfile > Merge pull request #837 from containers/dependabot/go_modules/github.com/containers/storage-1.16.1 > Add $HOME/.config/containers/certs.d to perHostCertDirPath > Add $HOME/.config/containers/registries.conf to config path > Merge pull request #832 from containers/dependabot/go_modules/github.com/klauspost/compress-1.10.2 > Bump github.com/opencontainers/selinux from 1.3.2 to 1.3.3 > Merge pull request #834 from vrothberg/registries.conf.d > Merge pull request #830 from containers/dependabot/go_modules/github.com/ulikunitz/xz-0.5.7 > Merge pull request #827 from containers/dependabot/go_modules/github.com/stretchr/testify-1.5.1 > Merge pull request #828 from containers/dependabot/go_modules/github.com/opencontainers/selinux-1.3.2 > Merge pull request #822 from containers/dependabot/go_modules/github.com/containers/storage-1.16.0 > Merge pull request #823 from containers/dependabot/go_modules/github.com/vbauerster/mpb/v4-4.12.1 > Merge pull request #824 from containers/dependabot/go_modules/github.com/klauspost/compress-1.10.1 > Merge pull request #825 from containers/dependabot/go_modules/github.com/stretchr/testify-1.5.0 > Merge pull request #818 from containers/dependabot/go_modules/github.com/klauspost/compress-1.10.0 > Merge pull request #816 from ricardomaraschini/bubble-up-error > Add storage.Transport.NewStoreReference > Add validateImageID > Simplify ID value check > Add storage.Transport.GetStoreIfSet > Add tarball.NewReference > Remove tarballReference.transport > Add docker/archive.NewReference > Re-order the members of archiveReference to a more logical order > Merge pull request #815 from TomSweeneyRedHat/coc > Fixed registries.conf > Merge pull request #812 from vrothberg/release > Bump github.com/mtrmac/gpgme from 0.1.1 to 0.1.2 > Merge pull request #809 from nalind/list-conversion > bump to v5.2.1-dev > v5.2.0 > Merge pull request #806 from containers/dependabot/go_modules/github.com/containers/storage-1.15.8 > Add tests for internal/iolimits > Also use ReadAtMost in docker/tarfile > Simplify error checking in iolimits.ReadAtMost > restrict sizes of inmem processed blobs > copy: relax platform checks > Merge pull request #777 from SUSE/registry-mirror-docker-docs > Merge pull request #802 from bkuschel/master > Merge pull request #800 from containers/dependabot/go_modules/github.com/opencontainers/selinux-1.3.1 > Merge pull request #798 from containers/dependabot/go_modules/github.com/klauspost/compress-1.9.8 > Merge pull request #796 from mtrmac/by-pointer > Merge pull request #795 from containers/dependabot/go_modules/github.com/containers/storage-1.15.7 > Merge pull request #794 from mtrmac/update-gpgme > Merge pull request #791 from containers/dependabot/go_modules/github.com/pkg/errors-0.9.1 > Bump github.com/pkg/errors from 0.8.1 to 0.9.0 > Merge pull request #788 from mtrmac/mirror-errors > Merge pull request #771 from sseago/docker-image-dest-schema1-config > Merge pull request #774 from mtrmac/retry-cleanups > Merge pull request #787 from containers/dependabot/go_modules/github.com/klauspost/compress-1.9.7 > Merge pull request #785 from containers/dependabot/go_modules/github.com/klauspost/compress-1.9.5 > Merge pull request #782 from containers/dependabot/go_modules/github.com/containers/storage-1.15.5 > Bump github.com/containers/storage from 1.15.3 to 1.15.4 > Bump github.com/vbauerster/mpb/v4 from 4.11.1 to 4.11.2 > Merge pull request #769 from TomSweeneyRedHat/dev/tsweeney/registries.confup > Merge pull request #779 from rhatdan/version > Merge pull request #773 from containers/dependabot/go_modules/github.com/containers/storage-1.15.3 > Merge pull request #768 from containers/dependabot/go_modules/github.com/containers/storage-1.15.2 > Merge pull request #767 from containers/dependabot/go_modules/github.com/klauspost/compress-1.9.4 > Enable Cirrus validation tests > make test-skopeo: only run unit tests > Makefile: split tools installation > internal/pkg/keyctl: drop deprecation warning > keyctl: tests: check errors > update github.com/vbauerster/mpb to v4 > Merge pull request #763 from containers/dependabot/go_modules/github.com/containers/storage-1.15.1 > storage_test.go: check storage interfaces > Merge pull request #761 from containers/dependabot/go_modules/github.com/klauspost/compress-1.9.3 > Merge pull request #759 from containers/dependabot/go_modules/github.com/containers/storage-1.15.0 > Merge pull request #731 from bege13mot/golangci-lint > Merge pull request #673 from lumjjb/encryption-policy > Merge pull request #741 from containers/dependabot/go_modules/github.com/imdario/mergo-0.3.8 > Merge pull request #740 from containers/dependabot/go_modules/github.com/docker/docker-credential-helpers-0.6.3 > Merge pull request #754 from containers/dependabot/go_modules/github.com/containers/storage-1.14.0 > Merge pull request #738 from SUSE/interface-fix > Merge pull request #752 from mtrmac/enforce-architecture > Merge pull request #744 from mtrmac/test-failures > Merge pull request #747 from Zyqsempai/495-allow-to-overwrite-default-tmp-dir > Merge pull request #732 from SUSE/reader-adaptions > Merge pull request #735 from mtrmac/release-5 > Merge pull request #719 from QiWang19/resperrpr > Merge pull request #734 from nalind/choose-source > Merge pull request #400 from nalind/manifest-lists > Merge pull request #703 from vrothberg/status-checks > Merge pull request #722 from gabemontero/add-openshift-dockercfg-secret-mount-non-home > Merge pull request #727 from mtrmac/test-skopeo-v4 > Merge pull request #726 from mtrmac/release-4.0.1 > Merge pull request #721 from mtrmac/go-mod-major > Merge pull request #725 from nalind/guess-with-no-layers > Merge pull request #723 from vrothberg/conversion > Merge pull request #718 from rhatdan/master > Merge pull request #716 from mtrmac/compression-types > Merge pull request #715 from mtrmac/containers-libtrust > Merge pull request #717 from vrothberg/update-storage > Merge pull request #714 from mtrmac/update-mergo > Merge pull request #709 from QiWang19/resplog > Merge pull request #701 from lsm5/master-openssl > Merge pull request #711 from nalind/update-accepted-certs > Merge pull request #708 from vrothberg/replace > Merge pull request #705 from vrothberg/fix-annotations > Merge pull request #683 from QiWang19/rm_all_keyring > Merge pull request #563 from vrothberg/copy-update-mime-types > Merge pull request #693 from vrothberg/post-mod > Merge pull request #682 from praseodym/go-mod > Merge pull request #686 from nalind/keyctl-tests > Merge pull request #690 from vrothberg/fix-nil-check > Merge pull request #685 from nalind/tmpdir > Merge pull request #691 from vrothberg/fix-ci > Merge pull request #688 from vrothberg/add-nil-check > Merge pull request #684 from vrothberg/copy-default-to-gzip > Merge pull request #639 from giuseppe/zstd > Merge pull request #681 from mtrmac/3.0.2 > Merge pull request #680 from QiWang19/disable_keyring > Merge pull request #678 from mtrmac/ostree-didnt-work-and-nobody-noticed > Merge pull request #677 from vrothberg/bump-version > Merge pull request #676 from mtrmac/keyctl-followup > Merge pull request #675 from nalind/keyctl-arches > Merge pull request #672 from vrothberg/bump-version > Merge pull request #630 from SUSE/registry-cache > Merge pull request #670 from SUSE/gocache-fix > Merge pull request #669 from mtrmac/bearer-token-tls > Merge pull request #667 from TomSweeneyRedHat/dev/tsweeney/touchupstore > Merge pull request #668 from QiWang19/keyring_authfile > Merge pull request #663 from mtrmac/drop-sysregistries-v1 > Merge pull request #658 from vrothberg/enforce-blocking > Merge pull request #661 from rhatdan/install > Merge pull request #660 from rhatdan/vendor > Merge pull request #619 from QiWang19/key > Merge pull request #659 from vrothberg/release > Merge pull request #657 from vrothberg/use-spinners > Merge pull request #587 from Silvanoc/default-ostree-stub > Merge pull request #652 from jvanz/248 > Merge pull request #651 from jvanz/issue510 > Merge pull request #650 from mtrmac/docker-delete-comment > Merge pull request #648 from SUSE/typo-fix > Merge pull request #647 from vrothberg/delete-oci > Merge pull request #583 from mtrmac/storage-TryReusingBlob-harder > Merge pull request #637 from mtrmac/beautify-registries-toml > Merge pull request #576 from mtrmac/tarfile-cleanup > Merge pull request #646 from vrothberg/delete-oci > Merge pull request #644 from giuseppe/fix-selinux-ostree-err > Merge pull request #643 from mtrmac/2.0 > Merge pull request #617 from mtrmac/mirror-cleanups > Merge pull request #635 from mtrmac/registries-v2-explicit-search > Merge pull request #629 from vrothberg/mirror-digest-only > Merge pull request #636 from mtrmac/sysregistriesv2-test-fixtures > Merge pull request #631 from TristanCacqueray/master > Merge pull request #626 from wking/normalize-registry-test-flake > Merge pull request #628 from mtrmac/mirror-cleanups-code > Merge pull request #625 from mtrmac/mirror-no-credentials > Merge pull request #627 from vrothberg/update-ubuntu > Merge pull request #623 from QiWang19/authComment > Merge pull request #622 from rhatdan/atomic > Merge pull request #621 from Silvanoc/silvano/go-binaries-not-in-path > Merge pull request #593 from wking/docker-config-test-fixtures > Merge pull request #615 from vrothberg/transports-docs > Merge pull request #564 from SUSE/docker-client-mirror > Merge pull request #616 from vrothberg/update-bolt > Merge pull request #597 from wking/GetAuthentication-for-logged-in > Merge pull request #613 from giuseppe/fix-namespace > Merge pull request #612 from giuseppe/fix-blobinfocache-rootless > Merge pull request #609 from rhatdan/version > Merge pull request #605 from rhatdan/vendor > Merge pull request #598 from wking/drop-redundant-domain-call > Merge pull request #602 from wking/blob-info-boltdb-separation > Merge pull request #603 from vrothberg/progress-bar-messages > Merge pull request #599 from wking/pat-path-typo > Merge pull request #600 from wking/drop-contributing-asterisks > Merge pull request #601 from vrothberg/fix-build > Merge pull request #594 from vrothberg/certs.d-manpage > Merge pull request #589 from wking/move-docker-config-tests > Merge pull request #592 from mtrmac/bic-memory > Merge pull request #591 from vrothberg/bump-version > Merge pull request #590 from vrothberg/sync-bic > Merge pull request #586 from mtrmac/mpg-fixes > Merge pull request #581 from vrothberg/mpb-progress-bars > Merge pull request #585 from nalind/storage-multiple-manifests > Merge pull request #573 from nalind/manifest-match > Merge pull request #584 from markmc/ecr-oci-invalid-json > Merge pull request #577 from arjun024/fix-resp-sigsegv > Merge pull request #579 from mtrmac/ostree-no-pipe > Merge pull request #578 from nalind/ostree-hang > Merge pull request #569 from umohnani8/export > Merge pull request #568 from teozkr/threadsafe-docker-archive-getblob > Merge pull request #565 from SUSE/log-cleanup > Merge pull request #557 from vrothberg/parallel-push > Merge pull request #561 from rhatdan/version > Merge pull request #558 from vrothberg/progress-bar-tty-check > Merge pull request #555 from mtrmac/home-gopath > Merge pull request #556 from vrothberg/add-vrothberg-to-maintainers > Merge pull request #553 from vrothberg/avoid-rc > Merge pull request #551 from vrothberg/progressbaroutput > Merge pull request #549 from vrothberg/lint > Merge pull request #545 from vrothberg/parapull > Merge pull request #543 from giuseppe/use-optimized-gzip > Merge pull request #542 from vrothberg/vendor-ostree > Merge pull request #534 from mtrmac/prefix-match > Merge pull request #541 from vrothberg/govet > Merge pull request #523 from kinvolk/dongsu/upgrade-go-1.11 > Merge pull request #536 from mtrmac/blob-info-caching > Merge pull request #468 from vrothberg/regsv2-docker > Merge pull request #533 from darkowlzz/godoc-fix > Merge pull request #525 from mtrmac/go-selinux > Merge pull request #520 from mtrmac/search-order > Merge pull request #522 from kinvolk/dongsu/fix-test-errors > Merge pull request #519 from nalind/copy-digest > Merge pull request #341 from ashcrow/fix-pkgs-in-readme > Merge pull request #521 from runcom/fix-build-golint > Merge pull request #517 from mtrmac/pingV1-no-error > Merge pull request #516 from mtrmac/http-statustext > Merge pull request #515 from mtrmac/run-containers-error-handling > Merge pull request #512 from nalind/missing-ca-certs > Merge pull request #508 from nalind/ping-error > Merge pull request #505 from nalind/difflock > Merge pull request #506 from nalind/duplicate-layer > Merge pull request #503 from nlewo/fix-pause > Merge pull request #502 from umohnani8/search > Merge pull request #501 from lucab/ups/ostree-commit-errcheck > Merge pull request #500 from rhatdan/vendor > Merge pull request #489 from mtrmac/certs.d-multiple-ca-files > Merge pull request #499 from mtrmac/cleanups > Merge pull request #487 from mtrmac/delete-permissions > Merge pull request #498 from mtrmac/git-validation-epoch > Merge pull request #497 from vrothberg/fix-conf-references > Merge pull request #486 from Silvanoc/master > Merge pull request #493 from vrothberg/rename-docs > Merge pull request #491 from nalind/healthconfig-start-period > Merge pull request #490 from rhatdan/skopeo > Merge pull request #483 from nalind/docker-daemon-stub > Merge pull request #481 from mtrmac/docker-archive-auto-compression > Merge pull request #472 from mtrmac/storage-emptylayers > Merge pull request #480 from SUSE/send-account-field-to-authenticated-docker-registries > Merge pull request #478 from praveenkumar/issue_475 > Merge pull request #474 from rhatdan/contributing > Merge pull request #473 from mtrmac/auth.json-path > Merge pull request #470 from umohnani8/search > Merge pull request #465 from TomSweeneyRedHat/dev/tsweeney/registriesman > Merge pull request #463 from vbatts/platform.2 > Merge pull request #467 from vrothberg/sysregsv2-config-cache > Merge pull request #466 from mtrmac/sysregistriesv2-comments > Merge pull request #464 from vrothberg/cleanup-sysregsv2 > Merge pull request #426 from mtrmac/305-cleanup-2 > Merge pull request #455 from agonzalezro/wrap-nil > Merge pull request #462 from rhatdan/spelling > Merge pull request #461 from giuseppe/pinpoint-ostree-thread > Merge pull request #433 from rhatdan/registries.conf > Merge pull request #446 from mgoltzsche/docker-dependency-update > Merge pull request #459 from mtrmac/c-storage-dep > Merge pull request #458 from umohnani8/transport > Merge pull request #454 from vrothberg/https-fallback > Merge pull request #457 from mtrmac/docker-err-ignored > Merge pull request #456 from nlewo/pr-tempDir > Merge pull request #450 from vrothberg/multitags > Merge pull request #301 from mtrmac/daemon-identity > Merge pull request #441 from novas0x2a/follow-tags > Merge pull request #451 from umohnani8/auth > Merge pull request #429 from vrothberg/mirror-support > Merge pull request #444 from agonzalezro/remove-deps-from-vendor > Merge pull request #439 from umohnani8/transport > Merge pull request #440 from mtrmac/context-cleanups > Merge pull request #431 from novas0x2a/context-everywhere > Merge pull request #435 from rhatdan/policy.json > Merge pull request #436 from rhatdan/vendor > Merge pull request #434 from jlsalmon/docker-daemon-plain-http > Merge pull request #370 from nlewo/pr/docker-archive > Merge pull request #430 from vrothberg/trimright-slashes > Merge pull request #420 from mtrmac/docker-errors > Merge pull request #428 from vrothberg/trim-slashes > Merge pull request #424 from umohnani8/auth > Merge pull request #416 from mtrmac/305-cleanup > Merge pull request #423 from umohnani8/gzip > Merge pull request #408 from vbatts/platform > Merge pull request #419 from umohnani8/dir > Merge pull request #392 from giuseppe/ostree-support-copy-layer-infos > Merge pull request #418 from mtrmac/normalize-before-conversion > Merge pull request #415 from jonboulle/oci_fix > Merge pull request #411 from umohnani8/certs > Merge pull request #406 from umohnani8/search > Merge pull request #410 from ripcurld0/close_409 Submodule src/github.com/containers/libtrust 000000000...14b96171a (new submodule) Submodule src/github.com/containers/ocicrypt 000000000...b87a4a69c (new submodule) Submodule src/github.com/containers/storage 000000000...e21e7107c (new submodule) Submodule src/github.com/docker/distribution 2461543d98..5f6282db7d (rewind): < Merge pull request #2824 from dmcgowan/update-version-file-2.7.1 < Merge pull request #2805 from dmcgowan/release-2.7.1 < Merge pull request #2821 from caervs/ISS-2819 < Merge pull request #2804 from caervs/ISS-2793-2.7 < Merge pull request #2802 from davidswu/2.7-autoredirect < Merge pull request #2775 from caervs/release_notes_2.7 < Merge pull request #2772 from dmcgowan/add-arm-flag < Merge pull request #2711 from davidswu/autoredirect < Merge pull request #2742 from tescherm/configure-bugsnag-logging < Merge pull request #2734 from mgrachev/patch-1 < Merge pull request #2735 from tonistiigi/update-dockerfile < Merge pull request #2729 from liyongxin/master < Merge pull request #2731 from mirake/fix-typos < Merge pull request #2730 from dmcgowan/version-update-2.7.0-rc.0 < Merge pull request #2721 from dmcgowan/release-notes-2.7.0-rc < Merge pull request #2720 from dmcgowan/update-release-process < Merge pull request #2723 from mirake/fix-typos < Merge pull request #2707 from davidswu/go-1.11 < Merge pull request #2712 from liyongxin/master < Merge pull request #2705 from mirake/fix-typo < Merge pull request #2631 from whoshuu/feature/improve-gcs-driver < Merge pull request #2704 from dmcgowan/fix-2703 < Merge pull request #2702 from caervs/fix_path_enumeration < Merge pull request #2698 from cquon/swift_vendor < Merge pull request #2701 from davidswu/metalinter < Merge pull request #2362 from twistlock/populate_htpasswd < Merge pull request #2639 from andrew-leung/manifesteventlayers < Merge pull request #2685 from manishtomar/mani-graceful-shutdown < Merge pull request #2680 from manishtomar/mani-fix-mem-leak < Merge pull request #2474 from vikstrous/disable-v1-master < Merge pull request #2694 from caervs/fix_nginx_spacing < Merge pull request #2328 from stepyu/patch-1 < Merge pull request #2368 from monikakatiyar16/patch-1 < Merge pull request #2689 from dmp42/reviewers < Merge pull request #2690 from dmcgowan/remove-aaron-maintainers < Merge pull request #2651 from mikebrow/manifest-version-test-on-put < Merge pull request #2681 from dmcgowan/update-yaml < Merge pull request #2687 from davidswu/remove-region-validation < Merge pull request #2678 from caervs/bump_aws < Merge pull request #2679 from dmcgowan/revert-bad-vendor-update < Merge pull request #2674 from Parth/patch-1 < Merge pull request #2673 from dmp42/TLS < Merge pull request #2671 from dmp42/goamz < Merge pull request #2632 from whoshuu/feature/improve-s3-driver < Merge pull request #2599 from legionus/storage-inmemory-deadlock < Merge pull request #2602 from dmage/errmessage < Merge pull request #2662 from dmcgowan/enable-structcheck < Merge pull request #2598 from dmcgowan/update-maintainers < Merge pull request #2661 from dmcgowan/enable-goimports < Merge pull request #2648 from manishtomar/tag-deleted-event < Merge pull request #2657 from dmcgowan/add-travis-ci < Merge pull request #2076 from mikebrow/ocitype < Merge pull request #2603 from yuwaMSFT2/newazuresdk < Merge pull request #2582 from thaJeztah/bump-golang-1.10 < Merge pull request #2594 from dmcgowan/update-integration-test-certs < Merge pull request #2556 from justincormack/fewer-gorillas < Merge pull request #2538 from tianon/challanges < Merge pull request #2501 from xiaonancc77/master < Merge pull request #2549 from miminar/redis-delete-key < Merge pull request #2535 from xiaods/master < Merge pull request #2466 from tifayuki/prometheus_go_metrics < Merge pull request #2520 from ywk253100/ignore_path_not_found_error < Merge pull request #2469 from felixbuenemann/letsencrypt-host-whitelist-support < Merge pull request #2471 from GarageDeveloper/master < Merge pull request #2507 from mistyhacks/fix-storage-driver-link < Merge pull request #2455 from sargun/make-walk-faster < Merge pull request #2500 from stevvooe/remove-net-context-vestiges < Merge pull request #2302 from zetaab/oma < Merge pull request #2484 from perlun/patch-1 < Merge pull request #2485 from perlun/patch-2 < Merge pull request #2447 from tifayuki/cloudfront-s3-filter < Merge pull request #2435 from zhouhaibing089/digestset-ut < Merge pull request #2448 from kklin/follow-relative-links < Merge pull request #2431 from mistyhacks/fix-keywords < Revert "Add text about win os version ordering" < Add text about win os version ordering < Merge pull request #2428 from zhouhaibing089/algo-import < Merge pull request #2402 from smarterclayton/order_manifest < Merge pull request #2416 from stevvooe/feed-the-linter < Merge pull request #2377 from stevvooe/healthcheck-storage-ignore-notfound < Merge pull request #2388 from tiborvass/remove-misused-context < Merge pull request #2384 from smarterclayton/client_retry < Merge pull request #2382 from smarterclayton/scope_check Submodule src/github.com/klauspost/compress 0000000000...788b7f06fe (new submodule) Submodule src/github.com/klauspost/pgzip 0000000000...3286875a12 (new submodule) Submodule src/github.com/opencontainers/image-spec 577479e4dc..775207bd45: > Merge pull request #790 from vrothberg/add-zstd-constants > Merge pull request #788 from giuseppe/zstd > Merge pull request #786 from estesp/meeting-ref > Merge pull request #757 from unasuke/fix_typo > Merge pull request #782 from odinuge/lint-issue > Merge pull request #772 from woernfl/patch-1 > merge branch 'pr-771' > Merge pull request #759 from jzelinskie/loosen-mediatypes > merge branch 'pr-768' > merge branch 'pr-765' > merge branch 'pr-762' > Update MAINTAINERS emails > merge branch 'pr-755' > Merge pull request #753 from HaraldNordgren/go_versions > Merge pull request #740 from francescomari/fix-link > Merge pull request #734 from vbatts/release-v1.0.1 > merge branch 'pr-750' > Merge pull request #716 from AkihiroSuda/index-is-required > merge branch 'pr-711' > Merge pull request #739 from mtrmac/id-based-loader Submodule src/github.com/ulikunitz/xz 0000000000...067145b448 (new submodule) --- .gitignore | 1 - .gitmodules | 21 ++++++++++ packages/docker_app_lifecycle/spec | 43 ++++++++++++-------- src/code.cloudfoundry.org/dockerapplifecycle | 2 +- src/github.com/BurntSushi/toml | 1 + src/github.com/containers/image | 2 +- src/github.com/containers/libtrust | 1 + src/github.com/containers/ocicrypt | 1 + src/github.com/containers/storage | 1 + src/github.com/docker/distribution | 2 +- src/github.com/klauspost/compress | 1 + src/github.com/klauspost/pgzip | 1 + src/github.com/opencontainers/image-spec | 2 +- src/github.com/ulikunitz/xz | 1 + 14 files changed, 57 insertions(+), 23 deletions(-) create mode 160000 src/github.com/BurntSushi/toml create mode 160000 src/github.com/containers/libtrust create mode 160000 src/github.com/containers/ocicrypt create mode 160000 src/github.com/containers/storage create mode 160000 src/github.com/klauspost/compress create mode 160000 src/github.com/klauspost/pgzip create mode 160000 src/github.com/ulikunitz/xz diff --git a/.gitignore b/.gitignore index afad75ede5..2fa061c850 100644 --- a/.gitignore +++ b/.gitignore @@ -67,7 +67,6 @@ src/github.com/cpuguy83/go-md2man # staticcheck src/honnef.co/go/tools -src/github.com/BurntSushi/toml # CATS for locally running tests src/github.com/cloudfoundry/cf-acceptance-tests/ diff --git a/.gitmodules b/.gitmodules index d7c532004d..742dfc4c32 100644 --- a/.gitmodules +++ b/.gitmodules @@ -453,3 +453,24 @@ [submodule "src/code.cloudfoundry.org/grootfs"] path = src/code.cloudfoundry.org/grootfs url = https://github.com/cloudfoundry/grootfs +[submodule "src/github.com/containers/libtrust"] + path = src/github.com/containers/libtrust + url = https://github.com/containers/libtrust +[submodule "src/github.com/containers/ocicrypt"] + path = src/github.com/containers/ocicrypt + url = https://github.com/containers/ocicrypt +[submodule "src/github.com/containers/storage"] + path = src/github.com/containers/storage + url = https://github.com/containers/storage +[submodule "src/github.com/klauspost/compress"] + path = src/github.com/klauspost/compress + url = https://github.com/klauspost/compress +[submodule "src/github.com/BurntSushi/toml"] + path = src/github.com/BurntSushi/toml + url = https://github.com/BurntSushi/toml +[submodule "src/github.com/klauspost/pgzip"] + path = src/github.com/klauspost/pgzip + url = https://github.com/klauspost/pgzip +[submodule "src/github.com/ulikunitz/xz"] + path = src/github.com/ulikunitz/xz + url = https://github.com/ulikunitz/xz diff --git a/packages/docker_app_lifecycle/spec b/packages/docker_app_lifecycle/spec index aa4802aa15..ed7bd97d6d 100644 --- a/packages/docker_app_lifecycle/spec +++ b/packages/docker_app_lifecycle/spec @@ -15,6 +15,7 @@ files: - code.cloudfoundry.org/dockerapplifecycle/launcher/*.go # gosub - code.cloudfoundry.org/dockerapplifecycle/protocol/*.go # gosub - code.cloudfoundry.org/ecrhelper/*.go # gosub + - github.com/BurntSushi/toml/*.go # gosub - github.com/Microsoft/go-winio/*.go # gosub - github.com/aws/aws-sdk-go/aws/*.go # gosub - github.com/aws/aws-sdk-go/aws/awserr/*.go # gosub @@ -106,15 +107,25 @@ files: - github.com/containers/image/docker/policyconfiguration/*.go # gosub - github.com/containers/image/docker/reference/*.go # gosub - github.com/containers/image/image/*.go # gosub + - github.com/containers/image/internal/iolimits/*.go # gosub + - github.com/containers/image/internal/pkg/keyctl/*.go # gosub + - github.com/containers/image/internal/pkg/platform/*.go # gosub - github.com/containers/image/manifest/*.go # gosub + - github.com/containers/image/pkg/blobinfocache/none/*.go # gosub + - github.com/containers/image/pkg/compression/*.go # gosub + - github.com/containers/image/pkg/compression/internal/*.go # gosub + - github.com/containers/image/pkg/compression/types/*.go # gosub - github.com/containers/image/pkg/docker/config/*.go # gosub - github.com/containers/image/pkg/strslice/*.go # gosub + - github.com/containers/image/pkg/sysregistriesv2/*.go # gosub - github.com/containers/image/pkg/tlsclientconfig/*.go # gosub - github.com/containers/image/transports/*.go # gosub - github.com/containers/image/types/*.go # gosub + - github.com/containers/libtrust/*.go # gosub + - github.com/containers/ocicrypt/spec/*.go # gosub + - github.com/containers/storage/pkg/homedir/*.go # gosub - github.com/docker/distribution/*.go # gosub - github.com/docker/distribution/digestset/*.go # gosub - - github.com/docker/distribution/metrics/*.go # gosub - github.com/docker/distribution/reference/*.go # gosub - github.com/docker/distribution/registry/api/errcode/*.go # gosub - github.com/docker/distribution/registry/api/v2/*.go # gosub @@ -123,24 +134,8 @@ files: - github.com/docker/distribution/registry/client/transport/*.go # gosub - github.com/docker/distribution/registry/storage/cache/*.go # gosub - github.com/docker/distribution/registry/storage/cache/memory/*.go # gosub - - github.com/docker/distribution/vendor/github.com/beorn7/perks/quantile/*.go # gosub - - github.com/docker/distribution/vendor/github.com/docker/go-metrics/*.go # gosub - - github.com/docker/distribution/vendor/github.com/golang/protobuf/proto/*.go # gosub - github.com/docker/distribution/vendor/github.com/gorilla/mux/*.go # gosub - - github.com/docker/distribution/vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/*.go # gosub - github.com/docker/distribution/vendor/github.com/opencontainers/go-digest/*.go # gosub - - github.com/docker/distribution/vendor/github.com/opencontainers/image-spec/specs-go/*.go # gosub - - github.com/docker/distribution/vendor/github.com/opencontainers/image-spec/specs-go/v1/*.go # gosub - - github.com/docker/distribution/vendor/github.com/prometheus/client_golang/prometheus/*.go # gosub - - github.com/docker/distribution/vendor/github.com/prometheus/client_golang/prometheus/promhttp/*.go # gosub - - github.com/docker/distribution/vendor/github.com/prometheus/client_model/go/*.go # gosub - - github.com/docker/distribution/vendor/github.com/prometheus/common/expfmt/*.go # gosub - - github.com/docker/distribution/vendor/github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg/*.go # gosub - - github.com/docker/distribution/vendor/github.com/prometheus/common/model/*.go # gosub - - github.com/docker/distribution/vendor/github.com/prometheus/procfs/*.go # gosub - - github.com/docker/distribution/vendor/github.com/prometheus/procfs/internal/util/*.go # gosub - - github.com/docker/distribution/vendor/github.com/prometheus/procfs/nfs/*.go # gosub - - github.com/docker/distribution/vendor/github.com/prometheus/procfs/xfs/*.go # gosub - github.com/docker/docker-credential-helpers/client/*.go # gosub - github.com/docker/docker-credential-helpers/credentials/*.go # gosub - github.com/docker/docker/api/types/versions/*.go # gosub @@ -161,8 +156,16 @@ files: - github.com/docker/docker/vendor/golang.org/x/sys/unix/*.s # gosub - github.com/docker/go-connections/sockets/*.go # gosub - github.com/docker/go-connections/tlsconfig/*.go # gosub - - github.com/docker/libtrust/*.go # gosub - github.com/ghodss/yaml/*.go # gosub + - github.com/klauspost/compress/flate/*.go # gosub + - github.com/klauspost/compress/fse/*.go # gosub + - github.com/klauspost/compress/huff0/*.go # gosub + - github.com/klauspost/compress/snappy/*.go # gosub + - github.com/klauspost/compress/snappy/*.s # gosub + - github.com/klauspost/compress/zstd/*.go # gosub + - github.com/klauspost/compress/zstd/internal/xxhash/*.go # gosub + - github.com/klauspost/compress/zstd/internal/xxhash/*.s # gosub + - github.com/klauspost/pgzip/*.go # gosub - github.com/konsorten/go-windows-terminal-sequences/*.go # gosub - github.com/opencontainers/go-digest/*.go # gosub - github.com/opencontainers/image-spec/specs-go/*.go # gosub @@ -172,6 +175,10 @@ files: - github.com/tedsuo/ifrit/*.go # gosub - github.com/tedsuo/ifrit/grouper/*.go # gosub - github.com/tedsuo/ifrit/sigmon/*.go # gosub + - github.com/ulikunitz/xz/*.go # gosub + - github.com/ulikunitz/xz/internal/hash/*.go # gosub + - github.com/ulikunitz/xz/internal/xlog/*.go # gosub + - github.com/ulikunitz/xz/lzma/*.go # gosub - golang.org/x/net/internal/socks/*.go # gosub - golang.org/x/net/proxy/*.go # gosub - golang.org/x/sys/unix/*.go # gosub diff --git a/src/code.cloudfoundry.org/dockerapplifecycle b/src/code.cloudfoundry.org/dockerapplifecycle index 4d909ee2ae..ed3c37b325 160000 --- a/src/code.cloudfoundry.org/dockerapplifecycle +++ b/src/code.cloudfoundry.org/dockerapplifecycle @@ -1 +1 @@ -Subproject commit 4d909ee2ae984892af9c42d5c055012af1604cb4 +Subproject commit ed3c37b32510c2a0a805e07d60ce7a99e224f342 diff --git a/src/github.com/BurntSushi/toml b/src/github.com/BurntSushi/toml new file mode 160000 index 0000000000..3012a1dbe2 --- /dev/null +++ b/src/github.com/BurntSushi/toml @@ -0,0 +1 @@ +Subproject commit 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005 diff --git a/src/github.com/containers/image b/src/github.com/containers/image index 495da41bd2..4276a4ff69 160000 --- a/src/github.com/containers/image +++ b/src/github.com/containers/image @@ -1 +1 @@ -Subproject commit 495da41bd26c50be62fa07ae903ea2ee54c00283 +Subproject commit 4276a4ff699bff88d8e25813d0e31d47679ecc13 diff --git a/src/github.com/containers/libtrust b/src/github.com/containers/libtrust new file mode 160000 index 0000000000..14b96171aa --- /dev/null +++ b/src/github.com/containers/libtrust @@ -0,0 +1 @@ +Subproject commit 14b96171aa3b7be82ffc4aef3b6942125120ebd4 diff --git a/src/github.com/containers/ocicrypt b/src/github.com/containers/ocicrypt new file mode 160000 index 0000000000..b87a4a69c7 --- /dev/null +++ b/src/github.com/containers/ocicrypt @@ -0,0 +1 @@ +Subproject commit b87a4a69c741007e2e8c713732c3e3da76f99dab diff --git a/src/github.com/containers/storage b/src/github.com/containers/storage new file mode 160000 index 0000000000..e21e7107c5 --- /dev/null +++ b/src/github.com/containers/storage @@ -0,0 +1 @@ +Subproject commit e21e7107c5e4aa769455bfee1b0c4687f96e963b diff --git a/src/github.com/docker/distribution b/src/github.com/docker/distribution index 2461543d98..5f6282db7d 160000 --- a/src/github.com/docker/distribution +++ b/src/github.com/docker/distribution @@ -1 +1 @@ -Subproject commit 2461543d988979529609e8cb6fca9ca190dc48da +Subproject commit 5f6282db7d65e6d72ad7c2cc66310724a57be716 diff --git a/src/github.com/klauspost/compress b/src/github.com/klauspost/compress new file mode 160000 index 0000000000..788b7f06fe --- /dev/null +++ b/src/github.com/klauspost/compress @@ -0,0 +1 @@ +Subproject commit 788b7f06fee85b7e1d2aa4a3a86f8dbbbcc771ae diff --git a/src/github.com/klauspost/pgzip b/src/github.com/klauspost/pgzip new file mode 160000 index 0000000000..3286875a12 --- /dev/null +++ b/src/github.com/klauspost/pgzip @@ -0,0 +1 @@ +Subproject commit 3286875a1223e4bd304d6bcc4bb2c463fae762f2 diff --git a/src/github.com/opencontainers/image-spec b/src/github.com/opencontainers/image-spec index 577479e4dc..775207bd45 160000 --- a/src/github.com/opencontainers/image-spec +++ b/src/github.com/opencontainers/image-spec @@ -1 +1 @@ -Subproject commit 577479e4dc273d3779f00c223c7e0dba4cd6b8b0 +Subproject commit 775207bd45b6cb8153ce218cc59351799217451f diff --git a/src/github.com/ulikunitz/xz b/src/github.com/ulikunitz/xz new file mode 160000 index 0000000000..067145b448 --- /dev/null +++ b/src/github.com/ulikunitz/xz @@ -0,0 +1 @@ +Subproject commit 067145b4480ef600b25a0403f386ea25ffe42fd5