diff --git a/ROADMAP.md b/ROADMAP.md index 52e22a2..68b953f 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -8,7 +8,7 @@ This list was taking from the [API reference](https://docs.docker.com/engine/api/v1.41/). * Containers - - [x] List containers + - [ ] List containers - [ ] Create a container - [ ] Inspect a container - [ ] List processes running inside a container @@ -61,7 +61,7 @@ reference](https://docs.docker.com/engine/api/v1.41/). - [ ] Delete unused networks * Volumes - - [x] List volumes + - [*] List volumes - [ ] Create a volume - [ ] Inspect a volume - [ ] Remove a volume diff --git a/containers.v b/containers.v index 9991e75..886c739 100644 --- a/containers.v +++ b/containers.v @@ -1,81 +1,12 @@ module vdocker import json +import net.urllib import time import net.http { Method } -pub struct Port { - ip string [json: IP] - private_port u16 [json: PrivatePort] - public_port u16 [json: PublicPort] - type_ string [json: Type] -} - -pub struct HostConfig { - network_mode string [json: NetworkMode] -} - -pub struct EndpointIpamConfig { - ipv4_address string [json: IPv4Address] - ipv6_address string [json: IPv6Address] - link_local_ips []string [json: LinkLocalIPs] -} - -pub struct EndpointSettings { - ipam_config EndpointIpamConfig [json: IPAMConfig] - links []string [json: Links] - aliases []string [json: Aliases] - network_id string [json: NetworkID] - endpoint_id string [json: EndpointID] - gateway string [json: Gateway] - ip_address string [json: IPAddress] - ip_prefix_len int [json: IPPrefixLen] - ipv6_gateway string [json: IPv6Gateway] - global_ipv6_address string [json: GlobalIPv6Address] - global_ipv6_prefix_len i64 [json: GlobalIPv6PrefixLen] - mac_address string [json: MacAddress] - driver_opts map[string]string [json: DriverOpts] -} - -pub struct NetworkSettings { - networks map[string]EndpointSettings [json: Networks] -} - -pub struct MountPoint { - type_ string [json: Type] - name string [json: Name] - source string [json: Source] - destination string [json: Destination] - driver string [json: Driver] - mode string [json: Mode] - rw bool [json: RW] - propagation string [json: Propagation] -} - -pub struct ContainerListItem { - id string [json: Id] - names []string [json: Names] - image string [json: Image] - image_id string [json: ImageID] - command string [json: Command] - created i64 [json: Created] - ports []Port [json: Ports] - size_rw i64 [json: SizeRw] - size_root_fs i64 [json: sizeRootFs] - labels map[string]string [json: Labels] - state string [json: State] - status string [json: Status] - host_config HostConfig [json: HostConfig] - network_settings NetworkSettings [json: NetworkSettings] - mounts []MountPoint [json: Mounts] -} - -pub fn (mut d DockerConn) container_list() ?[]ContainerListItem { - d.send_request(Method.get, '/containers/json')? - - data := d.read_json_response<[]ContainerListItem>()? - - return data +struct DockerError { + message string } pub struct NewContainer { @@ -95,7 +26,7 @@ pub: // create_container creates a new container with the given config. pub fn (mut d DockerConn) create_container(c NewContainer) ?CreatedContainer { - d.send_request_with_json(Method.post, '/containers/create', c)? + d.send_request_with_json(Method.post, urllib.parse('/v1.41/containers/create')?, c)? head, res := d.read_response()? if head.status_code != 201 { @@ -111,7 +42,7 @@ pub fn (mut d DockerConn) create_container(c NewContainer) ?CreatedContainer { // start_container starts the container with the given id. pub fn (mut d DockerConn) start_container(id string) ? { - d.send_request(Method.post, 'containers/$id/start')? + d.send_request(Method.post, urllib.parse('/v1.41/containers/$id/start')?)? head, body := d.read_response()? if head.status_code != 204 { @@ -141,7 +72,7 @@ pub mut: // inspect_container returns detailed information for a given container. pub fn (mut d DockerConn) inspect_container(id string) ?ContainerInspect { - d.send_request(Method.get, 'containers/$id/json')? + d.send_request(Method.get, urllib.parse('/v1.41/containers/$id/json')?)? head, body := d.read_response()? if head.status_code != 200 { @@ -164,7 +95,7 @@ pub fn (mut d DockerConn) inspect_container(id string) ?ContainerInspect { // remove_container removes the container with the given id. pub fn (mut d DockerConn) remove_container(id string) ? { - d.send_request(Method.delete, 'containers/$id')? + d.send_request(Method.delete, urllib.parse('/v1.41/containers/$id')?)? head, body := d.read_response()? if head.status_code != 204 { @@ -177,7 +108,7 @@ pub fn (mut d DockerConn) remove_container(id string) ? { // get_container_logs returns a reader object allowing access to the // container's logs. pub fn (mut d DockerConn) get_container_logs(id string) ?&StreamFormatReader { - d.send_request(Method.get, 'containers/$id/logs?stdout=true&stderr=true')? + d.send_request(Method.get, urllib.parse('/v1.41/containers/$id/logs?stdout=true&stderr=true')?)? head := d.read_response_head()? if head.status_code != 200 { diff --git a/docker.v b/docker.v index 9eaa1a9..1784599 100644 --- a/docker.v +++ b/docker.v @@ -7,15 +7,12 @@ import strings import net.urllib import json import util -import time const ( socket = '/var/run/docker.sock' buf_len = 10 * 1024 http_separator = [u8(`\r`), `\n`, `\r`, `\n`] http_chunk_separator = [u8(`\r`), `\n`] - timestamp_attr = 'timestamp' - api_version = 'v1.41' ) pub struct DockerConn { @@ -42,8 +39,7 @@ pub fn (mut d DockerConn) close() ? { } // send_request sends an HTTP request without body. -fn (mut d DockerConn) send_request(method http.Method, url_str string) ? { - url := urllib.parse('/$vdocker.api_version$url_str')? +fn (mut d DockerConn) send_request(method http.Method, url urllib.URL) ? { req := '$method $url.request_uri() HTTP/1.1\nHost: localhost\n\n' d.socket.write_string(req)? @@ -53,8 +49,7 @@ fn (mut d DockerConn) send_request(method http.Method, url_str string) ? { } // send_request_with_body sends an HTTP request with the given body. -fn (mut d DockerConn) send_request_with_body(method http.Method, url_str string, content_type string, body string) ? { - url := urllib.parse('/$vdocker.api_version$url_str')? +fn (mut d DockerConn) send_request_with_body(method http.Method, url urllib.URL, content_type string, body string) ? { req := '$method $url.request_uri() HTTP/1.1\nHost: localhost\nContent-Type: $content_type\nContent-Length: $body.len\n\n$body\n\n' d.socket.write_string(req)? @@ -65,10 +60,10 @@ fn (mut d DockerConn) send_request_with_body(method http.Method, url_str string, // send_request_with_json is a convenience wrapper around // send_request_with_body that encodes the input as JSON. -fn (mut d DockerConn) send_request_with_json(method http.Method, url_str string, data &T) ? { +fn (mut d DockerConn) send_request_with_json(method http.Method, url urllib.URL, data &T) ? { body := json.encode(data) - return d.send_request_with_body(method, url_str, 'application/json', body) + return d.send_request_with_body(method, url, 'application/json', body) } // read_response_head consumes the socket's contents until it encounters @@ -124,26 +119,6 @@ fn (mut d DockerConn) read_response() ?(http.Response, string) { return head, res } -fn (mut d DockerConn) read_json_response() ?T { - head, body := d.read_response()? - - if head.status_code < 200 || head.status_code > 300 { - data := json.decode(DockerError, body)? - - return docker_error(head.status_code, data.message) - } - - mut data := json.decode(T, body)? - - //$for field in T.fields { - //$if field.typ is time.Time { - // data.$(field.name) = time.parse_rfc3339(data.$(field.name + '_str'))? - //} - //} - - return data -} - // get_chunked_response_reader returns a ChunkedResponseReader using the socket // as reader. fn (mut d DockerConn) get_chunked_response_reader() &ChunkedResponseReader { diff --git a/errors.v b/errors.v deleted file mode 100644 index e5da55a..0000000 --- a/errors.v +++ /dev/null @@ -1,21 +0,0 @@ -module vdocker - -struct DockerError { - status int [skip] - message string -} - -fn (err DockerError) code() int { - return err.status -} - -fn (err DockerError) msg() string { - return err.message -} - -fn docker_error(status int, message string) IError { - return IError(DockerError{ - status: status - message: message - }) -} diff --git a/images.v b/images.v index aeaa53f..945951d 100644 --- a/images.v +++ b/images.v @@ -1,6 +1,7 @@ module vdocker import net.http { Method } +import net.urllib import json struct Image { @@ -10,7 +11,7 @@ pub: // pull_image pulls the given image:tag. pub fn (mut d DockerConn) pull_image(image string, tag string) ? { - d.send_request(Method.post, 'images/create?fromImage=$image&tag=$tag')? + d.send_request(Method.post, urllib.parse('/v1.41/images/create?fromImage=$image&tag=$tag')?)? head := d.read_response_head()? if head.status_code != 200 { @@ -33,7 +34,7 @@ pub fn (mut d DockerConn) pull_image(image string, tag string) ? { // create_image_from_container creates a new image from a container. pub fn (mut d DockerConn) create_image_from_container(id string, repo string, tag string) ?Image { - d.send_request(Method.post, 'commit?container=$id&repo=$repo&tag=$tag')? + d.send_request(Method.post, urllib.parse('/v1.41/commit?container=$id&repo=$repo&tag=$tag')?)? head, body := d.read_response()? if head.status_code != 201 { @@ -49,7 +50,7 @@ pub fn (mut d DockerConn) create_image_from_container(id string, repo string, ta // remove_image removes the image with the given id. pub fn (mut d DockerConn) remove_image(id string) ? { - d.send_request(Method.delete, 'images/$id')? + d.send_request(Method.delete, urllib.parse('/v1.41/images/$id')?)? head, body := d.read_response()? if head.status_code != 200 { diff --git a/volumes.v b/volumes.v index 9642198..1ef10b0 100644 --- a/volumes.v +++ b/volumes.v @@ -1,6 +1,8 @@ module vdocker import net.http { Method } +import net.urllib +import json import time struct UsageData { @@ -11,10 +13,10 @@ struct UsageData { struct Volume { created_at_str string [json: CreatedAt] pub mut: - created_at time.Time [skip] name string [json: Name] driver string [json: Driver] mountpoint string [json: Mountpoint] + created_at time.Time [skip] status map[string]string [json: Status] labels map[string]string [json: Labels] scope string [json: Scope] @@ -22,23 +24,22 @@ pub mut: usage_data UsageData [json: UsageData] } -[params] -pub struct VolumeListFilter { - dangling bool - driver string - labels []string - name string -} - struct VolumeListResponse { volumes []Volume [json: Volumes] warnings []string [json: Warnings] } pub fn (mut d DockerConn) volume_list() ?VolumeListResponse { - d.send_request(Method.get, '/volumes')? + d.send_request(Method.get, urllib.parse('/v1.41/volumes')?)? + head, body := d.read_response()? - mut data := d.read_json_response()? + if head.status_code != 200 { + data := json.decode(DockerError, body)? + + return error(data.message) + } + + mut data := json.decode(VolumeListResponse, body)? for mut vol in data.volumes { vol.created_at = time.parse_rfc3339(vol.created_at_str)?