Merge pull request #2344 from kolyshkin/no-dm
Makefile,.golangci.yml: rm exclude_graphdriver_devicemapper
This commit is contained in:
commit
c5300bbc84
|
|
@ -13,7 +13,6 @@ run:
|
||||||
- selinux
|
- selinux
|
||||||
- systemd
|
- systemd
|
||||||
- exclude_graphdriver_btrfs
|
- exclude_graphdriver_btrfs
|
||||||
- exclude_graphdriver_devicemapper
|
|
||||||
- containers_image_openpgp
|
- containers_image_openpgp
|
||||||
concurrency: 6
|
concurrency: 6
|
||||||
deadline: 5m
|
deadline: 5m
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ run:
|
||||||
- selinux
|
- selinux
|
||||||
- systemd
|
- systemd
|
||||||
- exclude_graphdriver_btrfs
|
- exclude_graphdriver_btrfs
|
||||||
- exclude_graphdriver_devicemapper
|
|
||||||
- containers_image_openpgp
|
- containers_image_openpgp
|
||||||
- cni
|
- cni
|
||||||
timeout: 5m
|
timeout: 5m
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ export GOPROXY=https://proxy.golang.org
|
||||||
|
|
||||||
GO ?= go
|
GO ?= go
|
||||||
GO_BUILD=$(GO) build
|
GO_BUILD=$(GO) build
|
||||||
BUILDTAGS := containers_image_openpgp,systemd,exclude_graphdriver_devicemapper
|
BUILDTAGS := containers_image_openpgp,systemd
|
||||||
DESTDIR ?=
|
DESTDIR ?=
|
||||||
PREFIX := /usr/local
|
PREFIX := /usr/local
|
||||||
CONFIGDIR := ${PREFIX}/share/containers
|
CONFIGDIR := ${PREFIX}/share/containers
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue