@catladder/cli 0.0.0-fix-rails-default-start-command-530390e3 → 0.0.0-fix-docker-host-07e1543a
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bundles/catenv/index.js +5 -3
- package/dist/bundles/cli/index.js +5 -3
- package/dist/cli/src/utils/gitlab.js +1 -0
- package/dist/cli/src/utils/gitlab.js.map +1 -1
- package/dist/pipeline/src/build/docker.js +1 -1
- package/dist/pipeline/src/build/docker.js.map +1 -1
- package/dist/pipeline/src/build/index.js +3 -2
- package/dist/pipeline/src/build/index.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/utils/gitlab.ts +1 -0
|
@@ -528,6 +528,7 @@ const setupGitlabToken = async (vorpal) => {
|
|
|
528
528
|
vorpal.log("");
|
|
529
529
|
vorpal.log("☝ in order to access the api, we need a personal access token");
|
|
530
530
|
vorpal.log("Its best to create one specifically for catladder");
|
|
531
|
+
vorpal.log("Scopes needed: api");
|
|
531
532
|
vorpal.log("");
|
|
532
533
|
vorpal.log("☝ we open up the settings page for you!");
|
|
533
534
|
vorpal.log("");
|
|
@@ -1830,7 +1831,7 @@ const requiresDockerBuild = (context) => {
|
|
|
1830
1831
|
exports.requiresDockerBuild = requiresDockerBuild;
|
|
1831
1832
|
// those need to be runner variables
|
|
1832
1833
|
const getDockerBuildRunnerVariables = () => ({
|
|
1833
|
-
DOCKER_HOST: "tcp://
|
|
1834
|
+
DOCKER_HOST: "tcp://docker:2375",
|
|
1834
1835
|
DOCKER_TLS_CERTDIR: "",
|
|
1835
1836
|
DOCKER_DRIVER: "overlay2",
|
|
1836
1837
|
DOCKER_BUILDKIT: "1", // see https://docs.docker.com/develop/develop-images/build_enhancements/
|
|
@@ -2006,9 +2007,10 @@ exports.BUILD_TYPES = {
|
|
|
2006
2007
|
rails: {
|
|
2007
2008
|
jobs: rails_1.createRailsJobs,
|
|
2008
2009
|
defaults: () => ({
|
|
2010
|
+
startCommand: "/cnb/process/web",
|
|
2009
2011
|
cnbBuilder: {
|
|
2010
|
-
image: "heroku/builder:
|
|
2011
|
-
packVersion: "0.
|
|
2012
|
+
image: "heroku/builder:24",
|
|
2013
|
+
packVersion: "0.36.4",
|
|
2012
2014
|
},
|
|
2013
2015
|
}),
|
|
2014
2016
|
},
|
|
@@ -3366,6 +3366,7 @@ const setupGitlabToken = async (vorpal) => {
|
|
|
3366
3366
|
vorpal.log("");
|
|
3367
3367
|
vorpal.log("☝ in order to access the api, we need a personal access token");
|
|
3368
3368
|
vorpal.log("Its best to create one specifically for catladder");
|
|
3369
|
+
vorpal.log("Scopes needed: api");
|
|
3369
3370
|
vorpal.log("");
|
|
3370
3371
|
vorpal.log("☝ we open up the settings page for you!");
|
|
3371
3372
|
vorpal.log("");
|
|
@@ -4848,7 +4849,7 @@ const requiresDockerBuild = (context) => {
|
|
|
4848
4849
|
exports.requiresDockerBuild = requiresDockerBuild;
|
|
4849
4850
|
// those need to be runner variables
|
|
4850
4851
|
const getDockerBuildRunnerVariables = () => ({
|
|
4851
|
-
DOCKER_HOST: "tcp://
|
|
4852
|
+
DOCKER_HOST: "tcp://docker:2375",
|
|
4852
4853
|
DOCKER_TLS_CERTDIR: "",
|
|
4853
4854
|
DOCKER_DRIVER: "overlay2",
|
|
4854
4855
|
DOCKER_BUILDKIT: "1", // see https://docs.docker.com/develop/develop-images/build_enhancements/
|
|
@@ -5024,9 +5025,10 @@ exports.BUILD_TYPES = {
|
|
|
5024
5025
|
rails: {
|
|
5025
5026
|
jobs: rails_1.createRailsJobs,
|
|
5026
5027
|
defaults: () => ({
|
|
5028
|
+
startCommand: "/cnb/process/web",
|
|
5027
5029
|
cnbBuilder: {
|
|
5028
|
-
image: "heroku/builder:
|
|
5029
|
-
packVersion: "0.
|
|
5030
|
+
image: "heroku/builder:24",
|
|
5031
|
+
packVersion: "0.36.4",
|
|
5030
5032
|
},
|
|
5031
5033
|
}),
|
|
5032
5034
|
},
|
|
@@ -18,6 +18,7 @@ const setupGitlabToken = async (vorpal) => {
|
|
|
18
18
|
vorpal.log("");
|
|
19
19
|
vorpal.log("☝ in order to access the api, we need a personal access token");
|
|
20
20
|
vorpal.log("Its best to create one specifically for catladder");
|
|
21
|
+
vorpal.log("Scopes needed: api");
|
|
21
22
|
vorpal.log("");
|
|
22
23
|
vorpal.log("☝ we open up the settings page for you!");
|
|
23
24
|
vorpal.log("");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitlab.js","sourceRoot":"","sources":["../../../../src/utils/gitlab.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAuD;AACvD,mCAAuC;AACvC,wDAAgC;AAChC,4DAA+B;AAC/B,gDAAwB;AAExB,+CAA4E;AAC5E,wEAAuE;AAEvE,MAAM,SAAS,GAAG,8BAA8B,CAAC;AAE1C,MAAM,cAAc,GAAG,KAAK,IAAI,EAAE,CAAC,MAAM,IAAA,2BAAa,EAAC,SAAS,CAAC,CAAC;AAA5D,QAAA,cAAc,kBAA8C;AAClE,MAAM,gBAAgB,GAAG,KAAK,EAAE,MAAuB,EAAE,EAAE;IAChE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACf,MAAM,CAAC,GAAG,CAAC,+DAA+D,CAAC,CAAC;IAC5E,MAAM,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAAC;IAChE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACf,MAAM,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;IACtD,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACf,MAAM,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,aAAa,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAChE,MAAM,CAAC,MAAM,CAAC;YACZ,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,gBAAgB;YACtB,IAAI,EAAE,QAAQ;SACf,CAAC;QACF,IAAA,+CAAuB,GAAE;KAC1B,CAAC,CAAC;IAEH,IAAA,cAAI,EAAC,WAAW,aAAa,yCAAyC,CAAC,CAAC;IAExE,MAAM,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAC;IAE5D,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;QAC5C,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,eAAe;QACrB,OAAO,EAAE,EAAE;QACX,OAAO,EAAE,6BAA6B;KACvC,CAAC,CAAC;IACH,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,IAAA,2BAAa,EAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IAChD,CAAC;AACH,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"gitlab.js","sourceRoot":"","sources":["../../../../src/utils/gitlab.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,7 +52,7 @@ const requiresDockerBuild = (context) => {
|
|
|
52
52
|
exports.requiresDockerBuild = requiresDockerBuild;
|
|
53
53
|
// those need to be runner variables
|
|
54
54
|
const getDockerBuildRunnerVariables = () => ({
|
|
55
|
-
DOCKER_HOST: "tcp://
|
|
55
|
+
DOCKER_HOST: "tcp://docker:2375",
|
|
56
56
|
DOCKER_TLS_CERTDIR: "",
|
|
57
57
|
DOCKER_DRIVER: "overlay2",
|
|
58
58
|
DOCKER_BUILDKIT: "1", // see https://docs.docker.com/develop/develop-images/build_enhancements/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/docker.ts"],"names":[],"mappings":";;;;;;AAAA,2BAAgC;AAChC,mCAA+B;AAC/B,gDAAwB;AAExB,sCAA2C;AAC3C,4EAI8C;AAC9C,kHAA+G;AAC/G,sCAA2C;AAO3C,4CAAsD;AACtD,2DAAwE;AAExE,MAAM,4BAA4B,GAAG;IACnC,sBAAsB,EAAE,MAAM;IAC9B,yBAAyB,EAAE,KAAK;IAChC,uBAAuB,EAAE,KAAK;CAC/B,CAAC;AAEK,MAAM,uBAAuB,GAAG,CAAC,OAAyB,EAAE,EAAE;;IACnE,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,OAAO;QACL,GAAG,CAAC,IAAA,uBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC;YACjD,CAAC,CAAC;gBACE,eAAe,EAAE,IAAA,4CAAwB,EAAC,OAAO,CAAC;gBAClD,YAAY,EAAE,IAAA,iDAA6B,EAAC,OAAO,CAAC;gBACpD,kBAAkB,EAAE,IAAA,uDAAmC,EAAC,OAAO,CAAC;aACjE;YACH,CAAC,CAAC,mBAAmB;gBACnB;oBACE,eAAe,EAAE,cAAc;oBAE/B,kBAAkB,EAAE,4BAA4B,GAAG,OAAO,CAAC,IAAI;oBAC/D,0BAA0B;oBAC1B,iBAAiB,EAAE,OAAO,CAAC,GAAG,GAAG,GAAG,GAAG,OAAO,CAAC,IAAI;oBACnD,YAAY,EAAE,uCAAuC;iBACtD,CAAC;QAEN,gBAAgB,EAAE,gBAAgB;KACnC,CAAC;AACJ,CAAC,CAAC;AArBW,QAAA,uBAAuB,2BAqBlC;AAEF;;GAEG;AACI,MAAM,mBAAmB,GAAG,CAAC,OAAyB,EAAW,EAAE;;IACxE,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAE5C,OAAO,CACL,IAAA,uBAAc,EACZ,YAAY,EACZ,YAAY,EACZ,iBAAiB,EACjB,WAAW,CACZ;QACD,CAAC,IAAA,uBAAc,EAAC,YAAY,EAAE,QAAQ,CAAC,IAAI,YAAY,CAAC,cAAc,CAAC,CACxE,CAAC;AACJ,CAAC,CAAC;AAZW,QAAA,mBAAmB,uBAY9B;AAEF,oCAAoC;AACpC,MAAM,6BAA6B,GAAG,GAAG,EAAE,CAAC,CAAC;IAC3C,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/docker.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,9 +59,10 @@ exports.BUILD_TYPES = {
|
|
|
59
59
|
rails: {
|
|
60
60
|
jobs: rails_1.createRailsJobs,
|
|
61
61
|
defaults: () => ({
|
|
62
|
+
startCommand: "/cnb/process/web",
|
|
62
63
|
cnbBuilder: {
|
|
63
|
-
image: "heroku/builder:
|
|
64
|
-
packVersion: "0.
|
|
64
|
+
image: "heroku/builder:24",
|
|
65
|
+
packVersion: "0.36.4",
|
|
65
66
|
},
|
|
66
67
|
}),
|
|
67
68
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAOA,qCAA4C;AAC5C,iCAA+E;AAC/E,mCAA0C;AAO1C,yCAAuB;AACvB,0CAAwB;AAWX,QAAA,WAAW,GAAe;IACrC,IAAI,EAAE;QACJ,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,YAAY;YAC1B,YAAY,EAAE,YAAY;YAC1B,cAAc,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;SAClC,CAAC;KACH;IACD,aAAa,EAAE;QACb,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,YAAY;YAC1B,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,SAAS,EAAE;QACT,IAAI,EAAE,0BAAmB;QACzB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,CAAC,wCAAwC,CAAC;YACxD,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,MAAM,EAAE;QACN,IAAI,EAAE,uBAAgB;QACtB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,cAAc;YAC5B,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,MAAM,EAAE;QACN,IAAI,EAAE,yBAAgB;QACtB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,KAAK,EAAE;QACL,IAAI,EAAE,uBAAe;QACrB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,UAAU,EAAE;gBACV,KAAK,EAAE,mBAAmB;gBAC1B,WAAW,EAAE,QAAQ;aACtB;SACF,CAAC;KACH;CACF,CAAC;AASW,QAAA,qBAAqB,GAAwB;IACxD,IAAI,EAAE;QACJ,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,YAAY;YAC1B,IAAI,EAAE;gBACJ,OAAO,EAAE,WAAW;aACrB;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,WAAW;aACrB;SACF,CAAC;KACH;CACF,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAOA,qCAA4C;AAC5C,iCAA+E;AAC/E,mCAA0C;AAO1C,yCAAuB;AACvB,0CAAwB;AAWX,QAAA,WAAW,GAAe;IACrC,IAAI,EAAE;QACJ,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,YAAY;YAC1B,YAAY,EAAE,YAAY;YAC1B,cAAc,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;SAClC,CAAC;KACH;IACD,aAAa,EAAE;QACb,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,YAAY;YAC1B,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,SAAS,EAAE;QACT,IAAI,EAAE,0BAAmB;QACzB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,CAAC,wCAAwC,CAAC;YACxD,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,MAAM,EAAE;QACN,IAAI,EAAE,uBAAgB;QACtB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,cAAc;YAC5B,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,MAAM,EAAE;QACN,IAAI,EAAE,yBAAgB;QACtB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC;KACH;IACD,KAAK,EAAE;QACL,IAAI,EAAE,uBAAe;QACrB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,kBAAkB;YAChC,UAAU,EAAE;gBACV,KAAK,EAAE,mBAAmB;gBAC1B,WAAW,EAAE,QAAQ;aACtB;SACF,CAAC;KACH;CACF,CAAC;AASW,QAAA,qBAAqB,GAAwB;IACxD,IAAI,EAAE;QACJ,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,YAAY,EAAE,YAAY;YAC1B,IAAI,EAAE;gBACJ,OAAO,EAAE,WAAW;aACrB;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,WAAW;aACrB;SACF,CAAC;KACH;CACF,CAAC"}
|