Merge pull request #1056 from codenrhoden/enhancement/docker-plugins-…

…updates Docker plugin updates
rexray · Oct 11, 2017 · 17bd4ea · 17bd4ea
2 parents acfc364 + 39132af
commit 17bd4ea
Show file tree

Hide file tree

Showing 20 changed files with 491 additions and 20 deletions.
diff --git a/.docker/plugins/Dockerfile b/.docker/plugins/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.6
 
 RUN apk update
 RUN apk add xfsprogs e2fsprogs ca-certificates
@@ -11,5 +11,5 @@ ADD rexray.yml /etc/rexray/rexray.yml
 ADD rexray.sh /rexray.sh
 RUN chmod +x /rexray.sh
 
-CMD [ "rexray", "start", "-f", "--nopid" ]
+CMD [ "rexray", "start", "--nopid" ]
 ENTRYPOINT [ "/rexray.sh" ]
diff --git a/.docker/plugins/azureud/.Dockerfile b/.docker/plugins/azureud/.Dockerfile
@@ -11,5 +11,5 @@ ADD rexray.yml /etc/rexray/rexray.yml
 ADD rexray.sh /rexray.sh
 RUN chmod +x /rexray.sh
 
-CMD [ "rexray", "start", "-f", "--nopid" ]
+CMD [ "rexray", "start", "--nopid" ]
 ENTRYPOINT [ "/rexray.sh" ]
diff --git a/.docker/plugins/azureud/config.json b/.docker/plugins/azureud/config.json
@@ -43,6 +43,38 @@
           ],
           "Value": "120s"
         },
+        {
+          "Description": "",
+          "Name": "LIBSTORAGE_INTEGRATION_VOLUME_OPERATIONS_MOUNT_ROOTPATH",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
+        {
+          "Description": "",
+          "Name": "LINUX_VOLUME_ROOTPATH",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
+        {
+          "Description": "",
+          "Name": "LINUX_VOLUME_FILEMODE",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
+        {
+          "Description": "",
+          "Name": "HTTP_PROXY",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
         {
           "Description": "",
           "Name": "AZUREUD_CLIENTID",

diff --git a/.docker/plugins/cinder/config.json b/.docker/plugins/cinder/config.json
@@ -35,6 +35,38 @@
           ],
           "Value": "false"
         },
+        {
+          "Description": "",
+          "Name": "HTTP_PROXY",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
+        {
+          "Description": "",
+          "Name": "LIBSTORAGE_INTEGRATION_VOLUME_OPERATIONS_MOUNT_ROOTPATH",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
+        {
+          "Description": "",
+          "Name": "LINUX_VOLUME_ROOTPATH",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
+        {
+          "Description": "",
+          "Name": "LINUX_VOLUME_FILEMODE",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
         {
           "Description": "",
           "Name": "CINDER_AUTHURL",
@@ -131,6 +163,30 @@
           ],
           "Value": ""
         },
+        {
+          "Description": "",
+          "Name": "CINDER_ATTACHTIMEOUT",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
+        {
+          "Description": "",
+          "Name": "CINDER_CREATETIMEOUT",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
+        {
+          "Description": "",
+          "Name": "CINDER_DELETETIMEOUT",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
         {
           "Description": "The sock file used by the CO to communicate with CSI.",
           "Name": "CSI_ENDPOINT",

diff --git a/.docker/plugins/dobs/config.json b/.docker/plugins/dobs/config.json
@@ -35,6 +35,38 @@
           ],
           "Value": "false"
         },
+        {
+          "Description": "",
+          "Name": "HTTP_PROXY",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
+        {
+          "Description": "",
+          "Name": "LIBSTORAGE_INTEGRATION_VOLUME_OPERATIONS_MOUNT_ROOTPATH",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
+        {
+          "Description": "",
+          "Name": "LINUX_VOLUME_ROOTPATH",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
+        {
+          "Description": "",
+          "Name": "LINUX_VOLUME_FILEMODE",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
         {
           "Description": "",
           "Name": "DOBS_CONVERTUNDERSCORES",

diff --git a/.docker/plugins/ebs/config.json b/.docker/plugins/ebs/config.json
@@ -35,6 +35,38 @@
           ],
           "Value": "false"
         },
+        {
+          "Description": "",
+          "Name": "HTTP_PROXY",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
+        {
+          "Description": "",
+          "Name": "LIBSTORAGE_INTEGRATION_VOLUME_OPERATIONS_MOUNT_ROOTPATH",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
+        {
+          "Description": "",
+          "Name": "LINUX_VOLUME_ROOTPATH",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
+        {
+          "Description": "",
+          "Name": "LINUX_VOLUME_FILEMODE",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
         {
           "Description": "",
           "Name": "EBS_ACCESSKEY",
@@ -43,6 +75,22 @@
           ],
           "Value": ""
         },
+        {
+          "Description": "",
+          "Name": "EBS_KMSKEYID",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
+        {
+          "Description": "",
+          "Name": "EBS_MAXRETRIES",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
         {
           "Description": "",
           "Name": "EBS_REGION",
@@ -59,6 +107,38 @@
           ],
           "Value": ""
         },
+        {
+          "Description": "",
+          "Name": "EBS_STATUSINITIALDELAY",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
+        {
+          "Description": "",
+          "Name": "EBS_STATUSMAXATTEMPTS",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
+        {
+          "Description": "",
+          "Name": "EBS_STATUSTIMEOUT",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
+        {
+          "Description": "",
+          "Name": "EBS_USELARGEDEVICERANGE",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
         {
           "Description": "",
           "Name": "CSI_ENDPOINT",

diff --git a/.docker/plugins/efs/.Dockerfile b/.docker/plugins/efs/.Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.6
 
 RUN apk update
 RUN apk add ca-certificates nfs-utils
@@ -11,5 +11,5 @@ ADD rexray.yml /etc/rexray/rexray.yml
 ADD rexray.sh /rexray.sh
 RUN chmod +x /rexray.sh
 
-CMD [ "rexray", "start", "-f", "--nopid" ]
+CMD [ "rexray", "start", "--nopid" ]
 ENTRYPOINT [ "/rexray.sh" ]
diff --git a/.docker/plugins/efs/config.json b/.docker/plugins/efs/config.json
@@ -27,6 +27,38 @@
           ],
           "Value": "false"
         },
+        {
+          "Description": "",
+          "Name": "HTTP_PROXY",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
+        {
+          "Description": "",
+          "Name": "LIBSTORAGE_INTEGRATION_VOLUME_OPERATIONS_MOUNT_ROOTPATH",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
+        {
+          "Description": "",
+          "Name": "LINUX_VOLUME_ROOTPATH",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
+        {
+          "Description": "",
+          "Name": "LINUX_VOLUME_FILEMODE",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
         {
           "Description": "",
           "Name": "EFS_ACCESSKEY",
@@ -75,6 +107,30 @@
           ],
           "Value": ""
         },
+        {
+          "Description": "",
+          "Name": "EFS_STATUSINITIALDELAY",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
+        {
+          "Description": "",
+          "Name": "EFS_STATUSMAXATTEMPTS",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
+        {
+          "Description": "",
+          "Name": "EFS_STATUSTIMEOUT",
+          "Settable": [
+            "value"
+          ],
+          "Value": ""
+        },
         {
           "Description": "",
           "Name": "CSI_ENDPOINT",