Skip to content

Commit 7315916

Browse files
author
Danny McCormick
authored
Move docker-common-v2 to a shared npm package (#13495)
1 parent 30c23b2 commit 7315916

File tree

78 files changed

+313
-6013
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+313
-6013
lines changed

‎Tasks/ACRTaskV0/make.json‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
{
2-
"common": [{
3-
"module": "../Common/docker-common-v2",
4-
"type": "node",
5-
"dest" : "./",
6-
"compile" : true
7-
},
2+
"common": [
83
{
94
"module": "../Common/utility-common-v2",
105
"type": "node",
@@ -15,7 +10,7 @@
1510
"rm": [
1611
{
1712
"items": [
18-
"node_modules/docker-common-v2/node_modules/azure-pipelines-task-lib",
13+
"node_modules/azure-pipelines-tasks-docker-common-v2/node_modules/azure-pipelines-task-lib",
1914
"node_modules/azure-pipelines-tasks-azure-arm-rest-v2/node_modules/vso-node-api",
2015
"node_modules/utility-common-v2/node_modules/azure-pipelines-task-lib"
2116
],

‎Tasks/ACRTaskV0/package-lock.json‎

Lines changed: 13 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Tasks/ACRTaskV0/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
"@types/q": "1.0.7",
2222
"archiver": "1.2.0",
2323
"azure-pipelines-task-lib": "2.8.0",
24+
"azure-pipelines-tasks-docker-common-v2": "1.0.0",
2425
"azure-pipelines-tasks-azure-arm-rest-v2": "1.0.0",
2526
"azure-pipelines-tool-lib": "0.11.0",
2627
"azure-storage": "^2.10.3",
27-
"docker-common-v2": "file:../../_build/Tasks/Common/docker-common-v2-1.0.0.tgz",
2828
"js-yaml": "3.13.1",
2929
"q": "1.4.1",
3030
"typed-rest-client": "0.12.0",

‎Tasks/ACRTaskV0/utilities/utils.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import * as os from "os";
22
import * as acrTaskRequest from "../models/acrtaskrequestbody";
3-
import * as imageUtils from "docker-common-v2/containerimageutils";
4-
import * as pipelineUtils from "docker-common-v2/pipelineutils";
3+
import * as imageUtils from "azure-pipelines-tasks-docker-common-v2/containerimageutils";
4+
import * as pipelineUtils from "azure-pipelines-tasks-docker-common-v2/pipelineutils";
55
import * as toolLib from 'azure-pipelines-tool-lib/tool';
66
import Q = require('q');
77
import fs = require('fs');
88
import path = require("path");
99
import tl = require("azure-pipelines-task-lib/task");
1010
import { AcrTask } from "../models/acrtaskparameters";
1111
import webClient = require("azure-pipelines-tasks-azure-arm-rest-v2/webClient");
12-
import { getBaseImageNameFromDockerFile } from "docker-common-v2/containerimageutils";
12+
import { getBaseImageNameFromDockerFile } from "azure-pipelines-tasks-docker-common-v2/containerimageutils";
1313
var archiver = require('archiver');
1414

1515
export class ArchiveUtil {

‎Tasks/AzureFunctionOnKubernetesV0/make.json‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
{
22
"common": [
3-
{
4-
"module": "../Common/docker-common-v2",
5-
"type": "node",
6-
"dest" : "./",
7-
"compile" : true
8-
},
93
{
104
"module": "../Common/kubernetes-common-v2",
115
"type": "node",
@@ -22,7 +16,7 @@
2216
"rm": [
2317
{
2418
"items": [
25-
"node_modules/docker-common-v2/node_modules/azure-pipelines-task-lib",
19+
"node_modules/azure-pipelines-tasks-docker-common-v2/node_modules/azure-pipelines-task-lib",
2620
"node_modules/kubernetes-common-v2/node_modules/azure-pipelines-task-lib",
2721
"node_modules/utility-common-v2/node_modules/azure-pipelines-task-lib"
2822
],

‎Tasks/AzureFunctionOnKubernetesV0/package-lock.json‎

Lines changed: 40 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Tasks/AzureFunctionOnKubernetesV0/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"dependencies": {
1515
"@types/node": "12.12.7",
1616
"@types/q": "^1.5.0",
17-
"docker-common-v2": "file:../../_build/Tasks/Common/docker-common-v2-1.0.0.tgz",
17+
"azure-pipelines-tasks-docker-common-v2": "1.0.0",
1818
"js-yaml": "3.13.1",
1919
"kubernetes-common-v2": "file:../../_build/Tasks/Common/kubernetes-common-v2-1.0.0.tgz",
2020
"utility-common-v2": "file:../../_build/Tasks/Common/utility-common-v2-2.0.0.tgz"

‎Tasks/AzureFunctionOnKubernetesV0/src/dockerConnection.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import * as url from "url";
22
import * as tl from 'azure-pipelines-task-lib/task';
3-
import * as ImageUtils from "docker-common-v2/containerimageutils";
4-
import ContainerConnection from "docker-common-v2/containerconnection";
5-
import RegistryAuthenticationToken from "docker-common-v2/registryauthenticationprovider/registryauthenticationtoken";
6-
import { getDockerRegistryEndpointAuthenticationToken } from "docker-common-v2/registryauthenticationprovider/registryauthenticationtoken";
3+
import * as ImageUtils from "azure-pipelines-tasks-docker-common-v2/containerimageutils";
4+
import ContainerConnection from "azure-pipelines-tasks-docker-common-v2/containerconnection";
5+
import RegistryAuthenticationToken from "azure-pipelines-tasks-docker-common-v2/registryauthenticationprovider/registryauthenticationtoken";
6+
import { getDockerRegistryEndpointAuthenticationToken } from "azure-pipelines-tasks-docker-common-v2/registryauthenticationprovider/registryauthenticationtoken";
77

88
export class DockerConnection {
99
private connection: ContainerConnection;

0 commit comments

Comments
 (0)