Prechádzať zdrojové kódy

Add HostConfig.Tmpfs to docs for container creation remote API

Signed-off-by: Sean McIntyre <s.mcintyre@xverba.ca>
(cherry picked from commit 2c38d43eb5276a82f8e076058506468e0d5a2f9f)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Sean McIntyre 8 rokov pred
rodič
commit
2d632c34ce

+ 3 - 0
docs/reference/api/docker_remote_api_v1.22.md

@@ -257,6 +257,7 @@ Create a container
            "StopSignal": "SIGTERM",
            "StopSignal": "SIGTERM",
            "HostConfig": {
            "HostConfig": {
              "Binds": ["/tmp:/tmp"],
              "Binds": ["/tmp:/tmp"],
+             "Tmpfs": { "/run": "rw,noexec,nosuid,size=65536k" },
              "Links": ["redis3:redis"],
              "Links": ["redis3:redis"],
              "Memory": 0,
              "Memory": 0,
              "MemorySwap": 0,
              "MemorySwap": 0,
@@ -364,6 +365,8 @@ Create a container
              _absolute_ path.
              _absolute_ path.
            + `volume-name:container-dest:ro` to mount the volume read-only
            + `volume-name:container-dest:ro` to mount the volume read-only
              inside the container.  `container-dest` must be an _absolute_ path.
              inside the container.  `container-dest` must be an _absolute_ path.
+    -   **Tmpfs** – A map of container directories which should be replaced by tmpfs mounts, and their corresponding
+          mount options. A JSON object in the form `{ "/run": "rw,noexec,nosuid,size=65536k" }`.
     -   **Links** - A list of links for the container. Each link entry should be
     -   **Links** - A list of links for the container. Each link entry should be
           in the form of `container_name:alias`.
           in the form of `container_name:alias`.
     -   **Memory** - Memory limit in bytes.
     -   **Memory** - Memory limit in bytes.

+ 3 - 0
docs/reference/api/docker_remote_api_v1.23.md

@@ -281,6 +281,7 @@ Create a container
            "StopSignal": "SIGTERM",
            "StopSignal": "SIGTERM",
            "HostConfig": {
            "HostConfig": {
              "Binds": ["/tmp:/tmp"],
              "Binds": ["/tmp:/tmp"],
+             "Tmpfs": { "/run": "rw,noexec,nosuid,size=65536k" },
              "Links": ["redis3:redis"],
              "Links": ["redis3:redis"],
              "Memory": 0,
              "Memory": 0,
              "MemorySwap": 0,
              "MemorySwap": 0,
@@ -389,6 +390,8 @@ Create a container
              _absolute_ path.
              _absolute_ path.
            + `volume-name:container-dest:ro` to mount the volume read-only
            + `volume-name:container-dest:ro` to mount the volume read-only
              inside the container.  `container-dest` must be an _absolute_ path.
              inside the container.  `container-dest` must be an _absolute_ path.
+    -   **Tmpfs** – A map of container directories which should be replaced by tmpfs mounts, and their corresponding
+          mount options. A JSON object in the form `{ "/run": "rw,noexec,nosuid,size=65536k" }`.
     -   **Links** - A list of links for the container. Each link entry should be
     -   **Links** - A list of links for the container. Each link entry should be
           in the form of `container_name:alias`.
           in the form of `container_name:alias`.
     -   **Memory** - Memory limit in bytes.
     -   **Memory** - Memory limit in bytes.

+ 3 - 0
docs/reference/api/docker_remote_api_v1.24.md

@@ -290,6 +290,7 @@ Create a container
            "StopSignal": "SIGTERM",
            "StopSignal": "SIGTERM",
            "HostConfig": {
            "HostConfig": {
              "Binds": ["/tmp:/tmp"],
              "Binds": ["/tmp:/tmp"],
+             "Tmpfs": { "/run": "rw,noexec,nosuid,size=65536k" },
              "Links": ["redis3:redis"],
              "Links": ["redis3:redis"],
              "Memory": 0,
              "Memory": 0,
              "MemorySwap": 0,
              "MemorySwap": 0,
@@ -404,6 +405,8 @@ Create a container
              _absolute_ path.
              _absolute_ path.
            + `volume-name:container-dest:ro` to mount the volume read-only
            + `volume-name:container-dest:ro` to mount the volume read-only
              inside the container.  `container-dest` must be an _absolute_ path.
              inside the container.  `container-dest` must be an _absolute_ path.
+    -   **Tmpfs** – A map of container directories which should be replaced by tmpfs mounts, and their corresponding
+          mount options. A JSON object in the form `{ "/run": "rw,noexec,nosuid,size=65536k" }`.
     -   **Links** - A list of links for the container. Each link entry should be
     -   **Links** - A list of links for the container. Each link entry should be
           in the form of `container_name:alias`.
           in the form of `container_name:alias`.
     -   **Memory** - Memory limit in bytes.
     -   **Memory** - Memory limit in bytes.

+ 3 - 0
docs/reference/api/docker_remote_api_v1.25.md

@@ -295,6 +295,7 @@ Create a container
            "StopTimeout": 10,
            "StopTimeout": 10,
            "HostConfig": {
            "HostConfig": {
              "Binds": ["/tmp:/tmp"],
              "Binds": ["/tmp:/tmp"],
+             "Tmpfs": { "/run": "rw,noexec,nosuid,size=65536k" },
              "Links": ["redis3:redis"],
              "Links": ["redis3:redis"],
              "Memory": 0,
              "Memory": 0,
              "MemorySwap": 0,
              "MemorySwap": 0,
@@ -418,6 +419,8 @@ Create a container
              _absolute_ path.
              _absolute_ path.
            + `volume-name:container-dest:ro` to mount the volume read-only
            + `volume-name:container-dest:ro` to mount the volume read-only
              inside the container.  `container-dest` must be an _absolute_ path.
              inside the container.  `container-dest` must be an _absolute_ path.
+    -   **Tmpfs** – A map of container directories which should be replaced by tmpfs mounts, and their corresponding
+          mount options. A JSON object in the form `{ "/run": "rw,noexec,nosuid,size=65536k" }`.
     -   **Links** - A list of links for the container. Each link entry should be
     -   **Links** - A list of links for the container. Each link entry should be
           in the form of `container_name:alias`.
           in the form of `container_name:alias`.
     -   **Memory** - Memory limit in bytes.
     -   **Memory** - Memory limit in bytes.