@magda/docker-utils 4.0.0-alpha.3 → 4.0.0-alpha.4
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.
|
@@ -19,7 +19,7 @@ function getName(name) {
|
|
|
19
19
|
if (name && typeof name === "string") {
|
|
20
20
|
return name;
|
|
21
21
|
}
|
|
22
|
-
return process.env.npm_package_config_docker_name ? process.env.npm_package_config_docker_name : process.env.npm_package_name ? "
|
|
22
|
+
return process.env.npm_package_config_docker_name ? process.env.npm_package_config_docker_name : process.env.npm_package_name ? "magda-" + process.env.npm_package_name.split("/")[1] : "UnnamedImage";
|
|
23
23
|
}
|
|
24
24
|
function getTags(tag, local, repository, version, name) {
|
|
25
25
|
if (tag === "auto") {
|
package/dist/docker-util.js
CHANGED
|
@@ -8,7 +8,7 @@ function getName(name) {
|
|
|
8
8
|
if (name && typeof name === "string") {
|
|
9
9
|
return name;
|
|
10
10
|
}
|
|
11
|
-
return process.env.npm_package_config_docker_name ? process.env.npm_package_config_docker_name : process.env.npm_package_name ? "
|
|
11
|
+
return process.env.npm_package_config_docker_name ? process.env.npm_package_config_docker_name : process.env.npm_package_name ? "magda-" + process.env.npm_package_name.split("/")[1] : "UnnamedImage";
|
|
12
12
|
}
|
|
13
13
|
function getTags(tag, local, repository, version, name) {
|
|
14
14
|
if (tag === "auto") {
|
package/dist/retag-and-push.js
CHANGED
|
@@ -14,7 +14,7 @@ function getName(name) {
|
|
|
14
14
|
if (name && typeof name === "string") {
|
|
15
15
|
return name;
|
|
16
16
|
}
|
|
17
|
-
return process.env.npm_package_config_docker_name ? process.env.npm_package_config_docker_name : process.env.npm_package_name ? "
|
|
17
|
+
return process.env.npm_package_config_docker_name ? process.env.npm_package_config_docker_name : process.env.npm_package_name ? "magda-" + process.env.npm_package_name.split("/")[1] : "UnnamedImage";
|
|
18
18
|
}
|
|
19
19
|
|
|
20
20
|
// ../../scripts/retag-and-push.js
|
|
@@ -32,7 +32,7 @@ var argv = yargs.config().help().option("fromPrefix", {
|
|
|
32
32
|
}).option("fromName", {
|
|
33
33
|
describe: "The package name that used to generate the fromTag. Used to optionally override the docker nanme config in package.json during the auto tagging.",
|
|
34
34
|
type: "string",
|
|
35
|
-
example: "
|
|
35
|
+
example: "magda-ckan-connector",
|
|
36
36
|
default: ""
|
|
37
37
|
}).option("fromVersion", {
|
|
38
38
|
describe: "The version of the existing image that will be given a new tag",
|
|
@@ -47,7 +47,7 @@ var argv = yargs.config().help().option("fromPrefix", {
|
|
|
47
47
|
}).option("toName", {
|
|
48
48
|
describe: "The package name that used to generate the toTag. Used to optionally override the docker nanme config in package.json during the auto tagging.",
|
|
49
49
|
type: "string",
|
|
50
|
-
example: "
|
|
50
|
+
example: "magda-ckan-connector",
|
|
51
51
|
default: ""
|
|
52
52
|
}).option("copyFromRegistry", {
|
|
53
53
|
describe: `When \`copyFromRegistry\`=true, [regctl](https://github.com/regclient/regclient) will be used.
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@magda/docker-utils",
|
|
3
3
|
"description": "MAGDA Docker Utilities",
|
|
4
|
-
"version": "4.0.0-alpha.
|
|
4
|
+
"version": "4.0.0-alpha.4",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
7
7
|
".": "./dist/docker-util.js",
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
"author": "",
|
|
24
24
|
"license": "Apache-2.0",
|
|
25
25
|
"devDependencies": {
|
|
26
|
-
"@magda/scripts": "^4.0.0-alpha.
|
|
26
|
+
"@magda/scripts": "^4.0.0-alpha.4"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
29
|
"fs-extra": "^11.2.0",
|