From 555d7f3a3203b0efaa71e07cd3c42e02df3c0387 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 14 Apr 2021 13:32:08 +0900 Subject: [PATCH 1/4] bump up containerd to 1.5.0-rc.1 Signed-off-by: Akihiro Suda --- .github/workflows/test.yml | 4 +-- Dockerfile | 2 +- .../SHA256SUMS.d/containerd-1.5.0-rc.0 | 2 -- .../SHA256SUMS.d/containerd-1.5.0-rc.1 | 2 ++ go.mod | 12 +++---- go.sum | 33 +++++++++++-------- 6 files changed, 31 insertions(+), 24 deletions(-) delete mode 100644 Dockerfile.d/SHA256SUMS.d/containerd-1.5.0-rc.0 create mode 100644 Dockerfile.d/SHA256SUMS.d/containerd-1.5.0-rc.1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ce625b871c8..98617323d5b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -42,7 +42,7 @@ jobs: timeout-minutes: 20 strategy: matrix: - containerd: [1.4.4, 1.5.0-rc.0] + containerd: [1.4.4, 1.5.0-rc.1] env: CONTAINERD_VERSION: "${{ matrix.containerd }}" steps: @@ -59,7 +59,7 @@ jobs: timeout-minutes: 20 strategy: matrix: - containerd: [1.4.4, 1.5.0-rc.0] + containerd: [1.4.4, 1.5.0-rc.1] env: CONTAINERD_VERSION: "${{ matrix.containerd }}" steps: diff --git a/Dockerfile b/Dockerfile index a56f0ad4e84..4bd1f679205 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ # Usage: `docker run -it --privileged `. Make sure to add `-t` and `--privileged`. # Basic deps -ARG CONTAINERD_VERSION=1.5.0-rc.0 +ARG CONTAINERD_VERSION=1.5.0-rc.1 ARG RUNC_VERSION=1.0.0-rc93 ARG CNI_PLUGINS_VERSION=0.9.1 diff --git a/Dockerfile.d/SHA256SUMS.d/containerd-1.5.0-rc.0 b/Dockerfile.d/SHA256SUMS.d/containerd-1.5.0-rc.0 deleted file mode 100644 index da8130ab715..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/containerd-1.5.0-rc.0 +++ /dev/null @@ -1,2 +0,0 @@ -67d798425ed6921d2195a9cd6346af3c1c65e2317cbf54fe40313c4149f8126b containerd-1.5.0-rc.0-linux-amd64.tar.gz -16a9e9fed866ad36246239582a1d72eb2f815b6b10298a8ae493dca72af71b31 containerd.service diff --git a/Dockerfile.d/SHA256SUMS.d/containerd-1.5.0-rc.1 b/Dockerfile.d/SHA256SUMS.d/containerd-1.5.0-rc.1 new file mode 100644 index 00000000000..033fb1c9ce9 --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/containerd-1.5.0-rc.1 @@ -0,0 +1,2 @@ +14f7b7d6c603f1c76c3f3984147b9767c1481c8bbe257fa88a4957d5c2af160a containerd-1.5.0-rc.1-linux-amd64.tar.gz +16a9e9fed866ad36246239582a1d72eb2f815b6b10298a8ae493dca72af71b31 containerd.service diff --git a/go.mod b/go.mod index 3da1742ec35..c25132b2e19 100644 --- a/go.mod +++ b/go.mod @@ -5,17 +5,17 @@ go 1.16 require ( github.com/compose-spec/compose-go v0.0.0-20210408102153-fe76f8471db2 github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68 - github.com/containerd/console v1.0.1 - github.com/containerd/containerd v1.5.0-rc.0 + github.com/containerd/console v1.0.2 + github.com/containerd/containerd v1.5.0-rc.1 github.com/containerd/go-cni v1.0.1 - github.com/containerd/imgcrypt v1.1.1-0.20210312161619-7ed62a527887 + github.com/containerd/imgcrypt v1.1.1-0.20210412181126-0bed51b9522c github.com/containerd/stargz-snapshotter v0.5.0 github.com/containerd/stargz-snapshotter/estargz v0.5.0 github.com/containerd/typeurl v1.0.1 github.com/containernetworking/cni v0.8.1 github.com/containernetworking/plugins v0.9.1 - github.com/docker/cli v20.10.5+incompatible - github.com/docker/docker v20.10.5+incompatible + github.com/docker/cli v20.10.6+incompatible + github.com/docker/docker v20.10.6+incompatible github.com/docker/go-connections v0.4.0 github.com/docker/go-units v0.4.0 github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect @@ -31,7 +31,7 @@ require ( github.com/sirupsen/logrus v1.8.1 github.com/urfave/cli/v2 v2.3.0 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c - golang.org/x/sys v0.0.0-20210228012217-479acdf4ea46 + golang.org/x/sys v0.0.0-20210324051608-47abb6519492 golang.org/x/term v0.0.0-20210406210042-72f3dc4e9b72 gotest.tools/v3 v3.0.3 ) diff --git a/go.sum b/go.sum index 03c539f2b5c..5655f4775f9 100644 --- a/go.sum +++ b/go.sum @@ -50,8 +50,9 @@ github.com/Microsoft/hcsshim v0.8.7-0.20190325164909-8abdbb8205e4/go.mod h1:Op3h github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ= github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg38RRsjT5y8= github.com/Microsoft/hcsshim v0.8.14/go.mod h1:NtVKoYxQuTLx6gEq0L96c9Ju4JbRJ4nY2ow3VK6a9Lg= -github.com/Microsoft/hcsshim v0.8.15 h1:Aof83YILRs2Vx3GhHqlvvfyx1asRJKMFIMeVlHsZKtI= github.com/Microsoft/hcsshim v0.8.15/go.mod h1:x38A4YbHbdxJtc0sF6oIz+RG0npwSCAvn69iY6URG00= +github.com/Microsoft/hcsshim v0.8.16 h1:8/auA4LFIZFTGrqfKhGBSXwM6/4X1fHa/xniyEHu8ac= +github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+VxGOoXdC600= github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5hlzMzRKMLyo42nCZ9oml8AdTlq/0cvIaBv6tK1RehU= github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= @@ -113,8 +114,9 @@ github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68/go.mod h1:ZJeTF github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE= -github.com/containerd/console v1.0.1 h1:u7SFAJyRqWcG6ogaMAx3KjSTy1e3hT9QxqX7Jco7dRc= github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw= +github.com/containerd/console v1.0.2 h1:Pi6D+aZXM+oUw1czuKgH5IJ+y0jhYcwBJfx5/Ghn9dE= +github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ= github.com/containerd/containerd v1.2.10/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= @@ -126,8 +128,9 @@ github.com/containerd/containerd v1.4.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMX github.com/containerd/containerd v1.5.0-beta.1/go.mod h1:5HfvG1V2FsKesEGQ17k5/T7V960Tmcumvqn8Mc+pCYQ= github.com/containerd/containerd v1.5.0-beta.3/go.mod h1:/wr9AVtEM7x9c+n0+stptlo/uBBoBORwEx6ardVcmKU= github.com/containerd/containerd v1.5.0-beta.4/go.mod h1:GmdgZd2zA2GYIBZ0w09ZvgqEq8EfBp/m3lcVZIvPHhI= -github.com/containerd/containerd v1.5.0-rc.0 h1:fVmAxX648SbHlWm3UnrkKQrZ+aeXznUnZttjbIYCF60= github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoTJseu1FGOKuoA4nNb2s= +github.com/containerd/containerd v1.5.0-rc.1 h1:7n80DQm69wXXjLGQo8sytMPC9Z+kG6B4s95hfbFLiXQ= +github.com/containerd/containerd v1.5.0-rc.1/go.mod h1:kAwhYasTYKvQWPnWf8CoRDu3vikb17YocPLvHMQhBn4= github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= @@ -149,8 +152,9 @@ github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod h1:PpyHr github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok= github.com/containerd/imgcrypt v1.0.1/go.mod h1:mdd8cEPW7TPgNG4FpuP3sGBiQ7Yi/zak9TYCG3juvb0= github.com/containerd/imgcrypt v1.0.4-0.20210301171431-0ae5c75f59ba/go.mod h1:6TNsg0ctmizkrOgXRNQjAPFWpMYRWuiB6dSF4Pfa5SA= -github.com/containerd/imgcrypt v1.1.1-0.20210312161619-7ed62a527887 h1:gjN37M4b3GvtvJyN6fnahr5A5fhj6PHLvzoNmdzoA74= github.com/containerd/imgcrypt v1.1.1-0.20210312161619-7ed62a527887/go.mod h1:5AZJNI6sLHJljKuI9IHnw1pWqo/F0nGDOuR9zgTs7ow= +github.com/containerd/imgcrypt v1.1.1-0.20210412181126-0bed51b9522c h1:Oxk0XK4+5lDlr/ItBwybtOb6vgyNM4dQn5mEaI186X8= +github.com/containerd/imgcrypt v1.1.1-0.20210412181126-0bed51b9522c/go.mod h1:xpLnwiQmEUJPvQoAapeb2SNCxz7Xr6PJrXQb0Dpc4ms= github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFYfE5+So4M5syatU0N0f0LbWpuqyMi4/BE8c= github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= github.com/containerd/stargz-snapshotter v0.5.0 h1:JcffikoW/RjJ+9kfYyiqmaKvI6lUuiPmSAKVInHQ4i0= @@ -179,8 +183,9 @@ github.com/containernetworking/plugins v0.8.6/go.mod h1:qnw5mN19D8fIwkqW7oHHYDHV github.com/containernetworking/plugins v0.9.1 h1:FD1tADPls2EEi3flPc2OegIY1M9pUa9r2Quag7HMLV8= github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRDjeJr6FLK6vuiUwoH7P8= github.com/containers/ocicrypt v1.0.1/go.mod h1:MeJDzk1RJHv89LjsH0Sp5KTY3ZYkjXO/C+bKAeWFIrc= -github.com/containers/ocicrypt v1.1.0 h1:A6UzSUFMla92uxO43O6lm86i7evMGjTY7wTKB2DyGPY= github.com/containers/ocicrypt v1.1.0/go.mod h1:b8AOe0YR67uU8OqfVNcznfFpAzu3rdgUV4GP9qXPfu4= +github.com/containers/ocicrypt v1.1.1 h1:prL8l9w3ntVqXvNH1CiNn5ENjcCnr38JqpSyvKKB4GI= +github.com/containers/ocicrypt v1.1.1/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY= github.com/coreos/go-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= github.com/coreos/go-iptables v0.5.0/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= @@ -215,15 +220,15 @@ github.com/distribution/distribution/v3 v3.0.0-20210316161203-a01c71e2477e h1:n8 github.com/distribution/distribution/v3 v3.0.0-20210316161203-a01c71e2477e/go.mod h1:xpWTC2KnJMiDLkoawhsPQcXjvwATEBcbq0xevG2YR9M= github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v20.10.5+incompatible h1:bjflayQbWg+xOkF2WPEAOi4Y7zWhR7ptoPhV/VqLVDE= -github.com/docker/cli v20.10.5+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v20.10.6+incompatible h1:LAyI6Lnwv+AUjtp2ZyN1lxqXBtkeFUqm4H7CZMWZuP8= +github.com/docker/cli v20.10.6+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v17.12.0-ce-rc1.0.20200730172259-9f28837c1d93+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.5+incompatible h1:o5WL5onN4awYGwrW7+oTn5x9AF2prw7V0Ox8ZEkoCdg= -github.com/docker/docker v20.10.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.6+incompatible h1:oXI3Vas8TI8Eu/EjH4srKHJBVqraSzJybhxY7Om9faQ= +github.com/docker/docker v20.10.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.3 h1:zI2p9+1NQYdnG6sMU26EX4aVGlqbInSQxQXLvzJ4RPQ= github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= @@ -673,8 +678,9 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 h1:hb9wdF1z5waM+dSIICn1l0DkLVDT3hqhhQsDNUmHPRE= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -741,8 +747,9 @@ golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777 h1:003p0dJM77cxMSyCPFphvZf/Y5/NXf5fzg6ufd1/Oew= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -825,8 +832,8 @@ golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210228012217-479acdf4ea46 h1:V066+OYJ66oTjnhm4Yrn7SXIwSCiDQJxpBxmvqb1N1c= -golang.org/x/sys v0.0.0-20210228012217-479acdf4ea46/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210324051608-47abb6519492 h1:Paq34FxTluEPvVyayQqMPgHm+vTOrIifmcYxFBx9TLg= +golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210406210042-72f3dc4e9b72 h1:VqE9gduFZ4dbR7XoL77lHFp0/DyDUBKSXK7CMFkVcV0= golang.org/x/term v0.0.0-20210406210042-72f3dc4e9b72/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= From 4ee2320f16f1ef24b26ff77b9ec77bb454d098a8 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 14 Apr 2021 13:43:31 +0900 Subject: [PATCH 2/4] CI: use mirrored images for avoiding DockerHub rate limit Signed-off-by: Akihiro Suda --- compose_up_test.go | 14 ++++++-------- pkg/testutil/testutil.go | 22 ++++++++++++++++------ 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/compose_up_test.go b/compose_up_test.go index 50bcf0a8d66..30c8a0e821e 100644 --- a/compose_up_test.go +++ b/compose_up_test.go @@ -30,13 +30,13 @@ import ( func TestComposeUp(t *testing.T) { base := testutil.NewBase(t) - const dockerComposeYAML = ` + var dockerComposeYAML = fmt.Sprintf(` version: '3.1' services: wordpress: - image: wordpress:5.7 + image: %s restart: always ports: - 8080:80 @@ -49,7 +49,7 @@ services: - wordpress:/var/www/html db: - image: mariadb:10.5 + image: %s restart: always environment: MYSQL_DATABASE: exampledb @@ -62,9 +62,7 @@ services: volumes: wordpress: db: -` - const wordpressIndexHTMLSnippet = "WordPress › Installation" - +`, testutil.WordpressImage, testutil.MariaDBImage) comp := testutil.NewComposeDir(t, dockerComposeYAML) defer comp.CleanUp() @@ -86,8 +84,8 @@ volumes: return err } t.Logf("respBody=%q", respBody) - if !strings.Contains(string(respBody), wordpressIndexHTMLSnippet) { - return errors.Errorf("respBody does not contain %q", wordpressIndexHTMLSnippet) + if !strings.Contains(string(respBody), testutil.WordpressIndexHTMLSnippet) { + return errors.Errorf("respBody does not contain %q", testutil.WordpressIndexHTMLSnippet) } return nil } diff --git a/pkg/testutil/testutil.go b/pkg/testutil/testutil.go index 6747dbf3137..26cdbb86d2f 100644 --- a/pkg/testutil/testutil.go +++ b/pkg/testutil/testutil.go @@ -310,11 +310,21 @@ func NewBase(t *testing.T) *Base { return base } -// TODO: do not use Docker Hub nor GCR mirror: https://github.com/containerd/nerdctl/issues/146 -const ( - AlpineImage = "alpine:3.13" - NginxAlpineImage = "nginx:1.19-alpine" +func mirrorOf(s string) string { + // plain mirror, NOT stargz-converted images + return fmt.Sprintf("ghcr.io/stargz-containers/%s-org", s) +} + +var ( + AlpineImage = mirrorOf("alpine:3.13") + NginxAlpineImage = mirrorOf("nginx:1.19-alpine") NginxAlpineIndexHTMLSnippet = "Welcome to nginx!" - RegistryImage = "registry:2" - FedoraESGZImage = "ghcr.io/stargz-containers/fedora:30-esgz" // eStargz + RegistryImage = mirrorOf("registry:2") + WordpressImage = mirrorOf("wordpress:5.7") + WordpressIndexHTMLSnippet = "WordPress › Installation" + MariaDBImage = mirrorOf("mariadb:10.5") +) + +const ( + FedoraESGZImage = "ghcr.io/stargz-containers/fedora:30-esgz" // eStargz ) From 64ce50dd83cca761bf9b296b5242d1eeab69f947 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 14 Apr 2021 13:49:14 +0900 Subject: [PATCH 3/4] compose: fix `got invalid project name "."` error Signed-off-by: Akihiro Suda --- pkg/composer/composer.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/composer/composer.go b/pkg/composer/composer.go index 02b7fdf5fd2..4f3362b1177 100644 --- a/pkg/composer/composer.go +++ b/pkg/composer/composer.go @@ -50,14 +50,19 @@ func New(o Options) (*Composer, error) { return nil, errors.New("got empty functions") } + var err error if o.File == "" { - var err error o.File, err = findComposeYAML() if err != nil { return nil, err } } + o.File, err = filepath.Abs(o.File) + if err != nil { + return nil, err + } + if o.Project == "" { o.Project = filepath.Base(filepath.Dir(o.File)) } From 0bffca060f1e2d89060ac1eb939f322253cf2a65 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 14 Apr 2021 14:00:01 +0900 Subject: [PATCH 4/4] examples/compose-wordpress: add stargz demo Signed-off-by: Akihiro Suda --- examples/compose-wordpress/README.md | 6 ++++++ .../docker-compose.stargz.yaml | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 examples/compose-wordpress/docker-compose.stargz.yaml diff --git a/examples/compose-wordpress/README.md b/examples/compose-wordpress/README.md index 96720a3d32c..7892ff298c1 100644 --- a/examples/compose-wordpress/README.md +++ b/examples/compose-wordpress/README.md @@ -4,3 +4,9 @@ Usage: - Substitute "examplepass" in [`docker-compose.yaml`](./docker-compose.yaml) to your own password. - Run `nerdctl compose up`. - Open http://localhost:8080, and make sure Wordpress is working. If you see "Error establishing a database connection", wait for a minute. + +## eStargz version + +eStargz version enables lazy-pulling. See [`../docs/stargz.md`](../docs/stargz.md). + +Usage: `nerdctl --snapshotter=stargz compose -f docker-compose.stargz.yaml up` diff --git a/examples/compose-wordpress/docker-compose.stargz.yaml b/examples/compose-wordpress/docker-compose.stargz.yaml new file mode 100644 index 00000000000..c5f6328ca6e --- /dev/null +++ b/examples/compose-wordpress/docker-compose.stargz.yaml @@ -0,0 +1,19 @@ +# # Docker Compose stack for Wordpress (eStargz version) + +# Usage: nerdctl --snapshotter=stargz compose -f docker-compose.stargz.yaml up +services: + wordpress: + image: ghcr.io/stargz-containers/wordpress:5.7-esgz + extends: + file: docker-compose.yaml + service: wordpress + + db: + image: ghcr.io/stargz-containers/mariadb:10.5-esgz + extends: + file: docker-compose.yaml + service: db + +volumes: + wordpress: + db: