Change the default path to the cli-api socket on non-windows platforms

Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
This commit is contained in:
Djordje Lukic 2020-07-06 16:07:22 +02:00
Родитель 0920fae85d
Коммит ab6abfca5d
13 изменённых файлов: 22 добавлений и 53 удалений

2
dist/containers.d.ts поставляемый
Просмотреть файл

@ -1 +1 @@
export { ExecRequest, ExecResponse, ListRequest, ListResponse, LogsRequest, LogsResponse, RunRequest, RunResponse, StopRequest, StopResponse, DeleteRequest, DeleteResponse, Container, Port, } from './protos/containers/v1/containers_pb';
export * from './protos/containers/v1/containers_pb';

17
dist/containers.js поставляемый
Просмотреть файл

@ -15,19 +15,6 @@
limitations under the License.
*/
Object.defineProperty(exports, "__esModule", { value: true });
var containers_pb_1 = require("./protos/containers/v1/containers_pb");
Object.defineProperty(exports, "ExecRequest", { enumerable: true, get: function () { return containers_pb_1.ExecRequest; } });
Object.defineProperty(exports, "ExecResponse", { enumerable: true, get: function () { return containers_pb_1.ExecResponse; } });
Object.defineProperty(exports, "ListRequest", { enumerable: true, get: function () { return containers_pb_1.ListRequest; } });
Object.defineProperty(exports, "ListResponse", { enumerable: true, get: function () { return containers_pb_1.ListResponse; } });
Object.defineProperty(exports, "LogsRequest", { enumerable: true, get: function () { return containers_pb_1.LogsRequest; } });
Object.defineProperty(exports, "LogsResponse", { enumerable: true, get: function () { return containers_pb_1.LogsResponse; } });
Object.defineProperty(exports, "RunRequest", { enumerable: true, get: function () { return containers_pb_1.RunRequest; } });
Object.defineProperty(exports, "RunResponse", { enumerable: true, get: function () { return containers_pb_1.RunResponse; } });
Object.defineProperty(exports, "StopRequest", { enumerable: true, get: function () { return containers_pb_1.StopRequest; } });
Object.defineProperty(exports, "StopResponse", { enumerable: true, get: function () { return containers_pb_1.StopResponse; } });
Object.defineProperty(exports, "DeleteRequest", { enumerable: true, get: function () { return containers_pb_1.DeleteRequest; } });
Object.defineProperty(exports, "DeleteResponse", { enumerable: true, get: function () { return containers_pb_1.DeleteResponse; } });
Object.defineProperty(exports, "Container", { enumerable: true, get: function () { return containers_pb_1.Container; } });
Object.defineProperty(exports, "Port", { enumerable: true, get: function () { return containers_pb_1.Port; } });
const tslib_1 = require("tslib");
tslib_1.__exportStar(require("./protos/containers/v1/containers_pb"), exports);
//# sourceMappingURL=containers.js.map

2
dist/containers.js.map поставляемый
Просмотреть файл

@ -1 +1 @@
{"version":3,"file":"containers.js","sourceRoot":"","sources":["../src/containers.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;EAcE;;AAEF,sEAe8C;AAd5C,4GAAA,WAAW,OAAA;AACX,6GAAA,YAAY,OAAA;AACZ,4GAAA,WAAW,OAAA;AACX,6GAAA,YAAY,OAAA;AACZ,4GAAA,WAAW,OAAA;AACX,6GAAA,YAAY,OAAA;AACZ,2GAAA,UAAU,OAAA;AACV,4GAAA,WAAW,OAAA;AACX,4GAAA,WAAW,OAAA;AACX,6GAAA,YAAY,OAAA;AACZ,8GAAA,aAAa,OAAA;AACb,+GAAA,cAAc,OAAA;AACd,0GAAA,SAAS,OAAA;AACT,qGAAA,IAAI,OAAA"}
{"version":3,"file":"containers.js","sourceRoot":"","sources":["../src/containers.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;EAcE;;;AAEF,+EAAqD"}

2
dist/contexts.d.ts поставляемый
Просмотреть файл

@ -1 +1 @@
export { ListRequest, ListResponse, SetCurrentRequest, SetCurrentResponse, } from './protos/contexts/v1/contexts_pb';
export * from './protos/contexts/v1/contexts_pb';

7
dist/contexts.js поставляемый
Просмотреть файл

@ -15,9 +15,6 @@
limitations under the License.
*/
Object.defineProperty(exports, "__esModule", { value: true });
var contexts_pb_1 = require("./protos/contexts/v1/contexts_pb");
Object.defineProperty(exports, "ListRequest", { enumerable: true, get: function () { return contexts_pb_1.ListRequest; } });
Object.defineProperty(exports, "ListResponse", { enumerable: true, get: function () { return contexts_pb_1.ListResponse; } });
Object.defineProperty(exports, "SetCurrentRequest", { enumerable: true, get: function () { return contexts_pb_1.SetCurrentRequest; } });
Object.defineProperty(exports, "SetCurrentResponse", { enumerable: true, get: function () { return contexts_pb_1.SetCurrentResponse; } });
const tslib_1 = require("tslib");
tslib_1.__exportStar(require("./protos/contexts/v1/contexts_pb"), exports);
//# sourceMappingURL=contexts.js.map

2
dist/contexts.js.map поставляемый
Просмотреть файл

@ -1 +1 @@
{"version":3,"file":"contexts.js","sourceRoot":"","sources":["../src/contexts.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;EAcE;;AAEF,gEAK0C;AAJxC,0GAAA,WAAW,OAAA;AACX,2GAAA,YAAY,OAAA;AACZ,gHAAA,iBAAiB,OAAA;AACjB,iHAAA,kBAAkB,OAAA"}
{"version":3,"file":"contexts.js","sourceRoot":"","sources":["../src/contexts.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;EAcE;;;AAEF,2EAAiD"}

2
dist/index.js поставляемый
Просмотреть файл

@ -25,7 +25,7 @@ const streams_grpc_pb_1 = require("./protos/streams/v1/streams_grpc_pb");
let addr = 'unix:////./pipe/dockerCliApi';
if (os_1.platform() !== 'win32') {
const homeDir = os_1.homedir();
addr = `unix://${homeDir}/Library/Containers/com.docker.docker/Data/docker-cli-api.sock`;
addr = `unix://${homeDir}/.docker/run/docker-cli-api.sock`;
}
class Containers extends containers_grpc_pb_1.ContainersClient {
constructor(address = addr) {

2
dist/index.js.map поставляемый
Просмотреть файл

@ -1 +1 @@
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;EAcE;;;AAEF,2BAAuC;AAEvC,2CAA4C;AAC5C,kFAA6E;AAC7E,4EAAuE;AACvE,yEAAoE;AACpE,yEAAsE;AAEtE,IAAI,IAAI,GAAG,8BAA8B,CAAC;AAC1C,IAAI,aAAQ,EAAE,KAAK,OAAO,EAAE;IAC1B,MAAM,OAAO,GAAG,YAAO,EAAE,CAAC;IAC1B,IAAI,GAAG,UAAU,OAAO,gEAAgE,CAAC;CAC1F;AACD,MAAa,UAAW,SAAQ,qCAAgB;IAC9C,YAAY,UAAkB,IAAI;QAChC,KAAK,CAAC,OAAO,EAAE,qBAAW,CAAC,cAAc,EAAE,CAAC,CAAC;IAC/C,CAAC;CACF;AAJD,gCAIC;AAED,MAAa,QAAS,SAAQ,iCAAc;IAC1C,YAAY,UAAkB,IAAI;QAChC,KAAK,CAAC,OAAO,EAAE,qBAAW,CAAC,cAAc,EAAE,CAAC,CAAC;IAC/C,CAAC;CACF;AAJD,4BAIC;AAED,MAAa,OAAQ,SAAQ,+BAAa;IACxC,YAAY,UAAkB,IAAI;QAChC,KAAK,CAAC,OAAO,EAAE,qBAAW,CAAC,cAAc,EAAE,CAAC,CAAC;IAC/C,CAAC;CACF;AAJD,0BAIC;AAED,MAAa,OAAQ,SAAQ,iCAAe;IAC1C,YAAY,UAAkB,IAAI;QAChC,KAAK,CAAC,OAAO,EAAE,qBAAW,CAAC,cAAc,EAAE,CAAC,CAAC;IAC/C,CAAC;CACF;AAJD,0BAIC"}
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;EAcE;;;AAEF,2BAAuC;AAEvC,2CAA4C;AAC5C,kFAA6E;AAC7E,4EAAuE;AACvE,yEAAoE;AACpE,yEAAsE;AAEtE,IAAI,IAAI,GAAG,8BAA8B,CAAC;AAC1C,IAAI,aAAQ,EAAE,KAAK,OAAO,EAAE;IAC1B,MAAM,OAAO,GAAG,YAAO,EAAE,CAAC;IAC1B,IAAI,GAAG,UAAU,OAAO,kCAAkC,CAAC;CAC5D;AACD,MAAa,UAAW,SAAQ,qCAAgB;IAC9C,YAAY,UAAkB,IAAI;QAChC,KAAK,CAAC,OAAO,EAAE,qBAAW,CAAC,cAAc,EAAE,CAAC,CAAC;IAC/C,CAAC;CACF;AAJD,gCAIC;AAED,MAAa,QAAS,SAAQ,iCAAc;IAC1C,YAAY,UAAkB,IAAI;QAChC,KAAK,CAAC,OAAO,EAAE,qBAAW,CAAC,cAAc,EAAE,CAAC,CAAC;IAC/C,CAAC;CACF;AAJD,4BAIC;AAED,MAAa,OAAQ,SAAQ,+BAAa;IACxC,YAAY,UAAkB,IAAI;QAChC,KAAK,CAAC,OAAO,EAAE,qBAAW,CAAC,cAAc,EAAE,CAAC,CAAC;IAC/C,CAAC;CACF;AAJD,0BAIC;AAED,MAAa,OAAQ,SAAQ,iCAAe;IAC1C,YAAY,UAAkB,IAAI;QAChC,KAAK,CAAC,OAAO,EAAE,qBAAW,CAAC,cAAc,EAAE,CAAC,CAAC;IAC/C,CAAC;CACF;AAJD,0BAIC"}

Просмотреть файл

@ -4,8 +4,7 @@
"main": "dist/index.js",
"typings": "dist/index.d.ts",
"files": [
"dist",
"src"
"dist/**/*"
],
"engines": {
"node": ">=10"
@ -13,6 +12,7 @@
"scripts": {
"start": "rollup -w -c",
"build": "tsc && yarn move-protos",
"prepublish": "yarn build",
"move-protos": "cp -r src/protos dist",
"test": "jest",
"test:watch": "jest --watch",
@ -29,7 +29,6 @@
},
"name": "@docker/sdk",
"author": "Docker Inc.",
"module": "dist/mylib.esm.js",
"devDependencies": {
"@babel/core": "^7.10.2",
"@babel/preset-env": "^7.10.2",
@ -54,6 +53,7 @@
"@grpc/grpc-js": "^1.0.5",
"@octokit/rest": "^18.0.0",
"google-auth-library": "^6.0.1",
"google-protobuf": "^3.12.2"
"google-protobuf": "^3.12.2",
"tslib": "^2.0.0"
}
}

Просмотреть файл

@ -14,19 +14,4 @@
limitations under the License.
*/
export {
ExecRequest,
ExecResponse,
ListRequest,
ListResponse,
LogsRequest,
LogsResponse,
RunRequest,
RunResponse,
StopRequest,
StopResponse,
DeleteRequest,
DeleteResponse,
Container,
Port,
} from './protos/containers/v1/containers_pb';
export * from './protos/containers/v1/containers_pb';

Просмотреть файл

@ -14,9 +14,4 @@
limitations under the License.
*/
export {
ListRequest,
ListResponse,
SetCurrentRequest,
SetCurrentResponse,
} from './protos/contexts/v1/contexts_pb';
export * from './protos/contexts/v1/contexts_pb';

Просмотреть файл

@ -25,7 +25,7 @@ import { StreamingClient } from './protos/streams/v1/streams_grpc_pb';
let addr = 'unix:////./pipe/dockerCliApi';
if (platform() !== 'win32') {
const homeDir = homedir();
addr = `unix://${homeDir}/Library/Containers/com.docker.docker/Data/docker-cli-api.sock`;
addr = `unix://${homeDir}/.docker/run/docker-cli-api.sock`;
}
export class Containers extends ContainersClient {
constructor(address: string = addr) {

Просмотреть файл

@ -5984,6 +5984,11 @@ tslib@^1.8.1:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
tslib@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.0.tgz#18d13fc2dce04051e20f074cc8387fd8089ce4f3"
integrity sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==
tsutils@^3.17.1:
version "3.17.1"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"