From 74289a486c00077bc3e91cda8ce064adb90617da Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Fri, 3 Jun 2016 11:42:20 -0700 Subject: [PATCH] update the docker plugin to use the default volume as the graph path --- .drone.yml | 2 +- .drone.yml.sig | 2 +- Dockerfile | 2 +- main.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 30d1610..b3c8eee 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,7 +9,7 @@ pipeline: - go test -cover -coverprofile=coverage.out - go build -ldflags "-s -w -X main.build=$DRONE_BUILD_NUMBER" docker: - storage_driver: overlay + storage_driver: vfs repo: plugins/docker tag: [ "latest", "1.0", "1" ] when: diff --git a/.drone.yml.sig b/.drone.yml.sig index b49e478..9d401d7 100644 --- a/.drone.yml.sig +++ b/.drone.yml.sig @@ -1 +1 @@ -eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgdGVzdDoKICAgIGltYWdlOiBnb2xhbmc6MS42CiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBDR09fRU5BQkxFRD0wCiAgICAgIC0gR08xNVZFTkRPUkVYUEVSSU1FTlQ9MQogICAgICAtIEdPUEFUSD0vZHJvbmUKICAgIGNvbW1hbmRzOgogICAgICAtIGdvIHRlc3QgLWNvdmVyIC1jb3ZlcnByb2ZpbGU9Y292ZXJhZ2Uub3V0CiAgICAgIC0gZ28gYnVpbGQgLWxkZmxhZ3MgIi1zIC13IC1YIG1haW4uYnVpbGQ9JERST05FX0JVSUxEX05VTUJFUiIKICBkb2NrZXI6CiAgICBzdG9yYWdlX2RyaXZlcjogb3ZlcmxheQogICAgcmVwbzogcGx1Z2lucy9kb2NrZXIKICAgIHRhZzogWyAibGF0ZXN0IiwgIjEuMCIsICIxIiBdCiAgICB3aGVuOgogICAgICBicmFuY2g6IG1hc3RlcgogICAgICBldmVudDogcHVzaAoKcGx1Z2luOgogIG5hbWU6IERvY2tlcgogIGRlc2M6IEJ1aWxkIGFuZCBwdWJsaXNoIGltYWdlcyB0byBhIERvY2tlciByZWdpc3RyeQogIHR5cGU6IHB1Ymxpc2gKICBpbWFnZTogcGx1Z2lucy9kb2NrZXIKICBsYWJlbHM6CiAgICAtIGRvY2tlcgogICAgLSBpbWFnZQogICAgLSBjb250YWluZXIK.P7vRbwL3k2k3aLbc34kI51QPI82vfOTImUd1JfKT0Z4 \ No newline at end of file +eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgdGVzdDoKICAgIGltYWdlOiBnb2xhbmc6MS42CiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBDR09fRU5BQkxFRD0wCiAgICAgIC0gR08xNVZFTkRPUkVYUEVSSU1FTlQ9MQogICAgICAtIEdPUEFUSD0vZHJvbmUKICAgIGNvbW1hbmRzOgogICAgICAtIGdvIHRlc3QgLWNvdmVyIC1jb3ZlcnByb2ZpbGU9Y292ZXJhZ2Uub3V0CiAgICAgIC0gZ28gYnVpbGQgLWxkZmxhZ3MgIi1zIC13IC1YIG1haW4uYnVpbGQ9JERST05FX0JVSUxEX05VTUJFUiIKICBkb2NrZXI6CiAgICBzdG9yYWdlX2RyaXZlcjogdmZzCiAgICByZXBvOiBwbHVnaW5zL2RvY2tlcgogICAgdGFnOiBbICJsYXRlc3QiLCAiMS4wIiwgIjEiIF0KICAgIHdoZW46CiAgICAgIGJyYW5jaDogbWFzdGVyCiAgICAgIGV2ZW50OiBwdXNoCgpwbHVnaW46CiAgbmFtZTogRG9ja2VyCiAgZGVzYzogQnVpbGQgYW5kIHB1Ymxpc2ggaW1hZ2VzIHRvIGEgRG9ja2VyIHJlZ2lzdHJ5CiAgdHlwZTogcHVibGlzaAogIGltYWdlOiBwbHVnaW5zL2RvY2tlcgogIGxhYmVsczoKICAgIC0gZG9ja2VyCiAgICAtIGltYWdlCiAgICAtIGNvbnRhaW5lcgo.F6oON9CzmytJ6osktjK8bLDkJLpepNb5dvCUPbjgr_U \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index babd7f0..b879985 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,4 +6,4 @@ FROM docker:1.11-dind ADD drone-docker /bin/ -ENTRYPOINT ["/bin/drone-docker"] +ENTRYPOINT [ "/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-docker" ] diff --git a/main.go b/main.go index b5f85ab..22ce220 100644 --- a/main.go +++ b/main.go @@ -50,7 +50,7 @@ func main() { cli.StringFlag{ Name: "daemon.storage-path", Usage: "docker daemon storage path", - Value: "/tmp/docker", + Value: "/var/lib/docker", EnvVar: "PLUGIN_STORAGE_PATH", }, cli.StringFlag{