From a22c43fa44cbd1361a07ead530300b9c100ae8f9 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 16 Mar 2021 15:35:37 +0100 Subject: [PATCH] go.mod: github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97 full diff: https://github.com/containerd/aufs/compare/ffdde1490233...20793ff83c97 Signed-off-by: Sebastiaan van Stijn --- go.mod | 2 +- go.sum | 4 ++-- .../github.com/containerd/aufs/.golangci.yml | 22 +++++++++++++++++++ vendor/github.com/containerd/aufs/.travis.yml | 20 ----------------- vendor/github.com/containerd/aufs/README.md | 4 +++- vendor/github.com/containerd/aufs/aufs.go | 1 - .../containerd/aufs/plugin/plugin.go | 1 - vendor/modules.txt | 2 +- 8 files changed, 29 insertions(+), 27 deletions(-) create mode 100644 vendor/github.com/containerd/aufs/.golangci.yml delete mode 100644 vendor/github.com/containerd/aufs/.travis.yml diff --git a/go.mod b/go.mod index e05f936a1..576507542 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/BurntSushi/toml v0.3.1 github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3 github.com/Microsoft/hcsshim v0.8.15 - github.com/containerd/aufs v0.0.0-20210313051948-ffdde1490233 + github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97 github.com/containerd/btrfs v0.0.0-20210316141732-918d888fb676 github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68 github.com/containerd/console v1.0.1 diff --git a/go.sum b/go.sum index ef299fc34..e13a9204d 100644 --- a/go.sum +++ b/go.sum @@ -92,8 +92,8 @@ github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE= github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU= -github.com/containerd/aufs v0.0.0-20210313051948-ffdde1490233 h1:WG1C8QfdnqC5+CM2FLg4WoVQdNMfMXMnXWc2tHzGZnY= -github.com/containerd/aufs v0.0.0-20210313051948-ffdde1490233/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= +github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97 h1:eDnTE2gn5fNykNuQdUIhr5XHqLJR52FXCGxhWNHG4FM= +github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e/go.mod h1:jg2QkJcsabfHugurUvvPhS3E08Oxiuh5W/g1ybB4e0E= github.com/containerd/btrfs v0.0.0-20210316141732-918d888fb676 h1:jNaRXAhCLuQ2x3k4nZNxaZN27/BCMhLfVkCEokYPI5Q= github.com/containerd/btrfs v0.0.0-20210316141732-918d888fb676/go.mod h1:zMcX3qkXTAi9GI50+0HOeuV8LU2ryCE/V2vG/ZBiTss= diff --git a/vendor/github.com/containerd/aufs/.golangci.yml b/vendor/github.com/containerd/aufs/.golangci.yml new file mode 100644 index 000000000..4cef1ca7a --- /dev/null +++ b/vendor/github.com/containerd/aufs/.golangci.yml @@ -0,0 +1,22 @@ +linters: + enable: + - structcheck + - varcheck + - staticcheck + - unconvert + - gofmt + - goimports + - golint + - ineffassign + - vet + - unused + - misspell + disable: + - errcheck + +issues: + include: + - EXC0002 + +run: + timeout: 2m diff --git a/vendor/github.com/containerd/aufs/.travis.yml b/vendor/github.com/containerd/aufs/.travis.yml deleted file mode 100644 index 5e5b681ac..000000000 --- a/vendor/github.com/containerd/aufs/.travis.yml +++ /dev/null @@ -1,20 +0,0 @@ -dist: bionic -language: go -go: - - 1.13.x - -install: - - go mod vendor - - pushd ..; go get -u github.com/vbatts/git-validation; popd - - pushd ..; go get -u github.com/kunalkushwaha/ltag; popd - -before_script: - - pushd ..; git clone https://github.com/containerd/project; popd - -script: - - DCO_VERBOSITY=-q ../project/script/validate/dco - - ../project/script/validate/fileheader ../project/ - - go test -v -race -covermode=atomic -coverprofile=coverage.txt ./... - -after_success: - - bash <(curl -s https://codecov.io/bash) diff --git a/vendor/github.com/containerd/aufs/README.md b/vendor/github.com/containerd/aufs/README.md index 5692990c4..ffcdf6769 100644 --- a/vendor/github.com/containerd/aufs/README.md +++ b/vendor/github.com/containerd/aufs/README.md @@ -1,7 +1,9 @@ # aufs snapshotter -[![Build Status](https://travis-ci.org/containerd/aufs.svg?branch=master)](https://travis-ci.org/containerd/aufs) +[![PkgGoDev](https://pkg.go.dev/badge/github.com/containerd/aufs)](https://pkg.go.dev/github.com/containerd/aufs) +[![Build Status](https://github.com/containerd/aufs/workflows/CI/badge.svg)](https://github.com/containerd/aufs/actions?query=workflow%3ACI) [![codecov](https://codecov.io/gh/containerd/aufs/branch/master/graph/badge.svg)](https://codecov.io/gh/containerd/aufs) +[![Go Report Card](https://goreportcard.com/badge/github.com/containerd/aufs)](https://goreportcard.com/report/github.com/containerd/aufs) AUFS implementation of the snapshot interface for containerd. diff --git a/vendor/github.com/containerd/aufs/aufs.go b/vendor/github.com/containerd/aufs/aufs.go index 6a385d603..897418290 100644 --- a/vendor/github.com/containerd/aufs/aufs.go +++ b/vendor/github.com/containerd/aufs/aufs.go @@ -38,7 +38,6 @@ import ( "github.com/pkg/errors" ) - var ( dirperm sync.Once dirpermEnabled bool diff --git a/vendor/github.com/containerd/aufs/plugin/plugin.go b/vendor/github.com/containerd/aufs/plugin/plugin.go index b26829bb8..79c9f2e77 100644 --- a/vendor/github.com/containerd/aufs/plugin/plugin.go +++ b/vendor/github.com/containerd/aufs/plugin/plugin.go @@ -23,7 +23,6 @@ import ( "github.com/pkg/errors" ) - // Config represents configuration for the zfs plugin type Config struct { // Root directory for the plugin diff --git a/vendor/modules.txt b/vendor/modules.txt index 7cf56d002..ef635e332 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -53,7 +53,7 @@ github.com/cilium/ebpf/asm github.com/cilium/ebpf/internal github.com/cilium/ebpf/internal/btf github.com/cilium/ebpf/internal/unix -# github.com/containerd/aufs v0.0.0-20210313051948-ffdde1490233 +# github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97 ## explicit github.com/containerd/aufs github.com/containerd/aufs/plugin