generator-reshow 0.17.4 → 0.17.7
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/generators/docker/README.md +1 -2
- package/generators/docker/index.js +17 -7
- package/generators/docker/templates/.env.build +2 -2
- package/generators/docker/templates/_circleci/config.yml +0 -1
- package/generators/docker/templates/bin/test.sh +11 -0
- package/generators/docker/templates/install-packages.sh +6 -0
- package/generators/npm/__tests__/Test.js +2 -0
- package/package.json +1 -1
|
@@ -35,7 +35,7 @@ module.exports = class extends YoGenerator {
|
|
|
35
35
|
|
|
36
36
|
const prompts = [
|
|
37
37
|
...commonPrompt.mainName(this),
|
|
38
|
-
...commonPrompt.desc(this, {keyword: false}),
|
|
38
|
+
...commonPrompt.desc(this, { keyword: false }),
|
|
39
39
|
...commonPrompt.repository(this, {
|
|
40
40
|
defaultRepositoryName: "[REPOSITORY_NAME]",
|
|
41
41
|
defaultRepositoryOrgName: "[REPOSITORY_ORG_NAME]",
|
|
@@ -71,15 +71,24 @@ module.exports = class extends YoGenerator {
|
|
|
71
71
|
const answers = await mergePromptOrOption(prompts, (nextPrompts) =>
|
|
72
72
|
promptChain(promptChainLocator(nextPrompts))
|
|
73
73
|
);
|
|
74
|
-
handleAnswers(answers)
|
|
74
|
+
handleAnswers(answers, (payload) => {
|
|
75
|
+
// add more payload
|
|
76
|
+
payload.folderPrefixGitIgnore = payload.folderPrefix
|
|
77
|
+
? payload.folderPrefix + "*"
|
|
78
|
+
: "";
|
|
79
|
+
let imgName = payload.mainName;
|
|
80
|
+
if (payload.dockerImageName) {
|
|
81
|
+
imgName = payload.dockerImageName;
|
|
82
|
+
if (payload.dockerOrgName) {
|
|
83
|
+
imgName = `${payload.dockerOrgName}/${payload.dockerImageName}`;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
payload.sourceImage = imgName;
|
|
87
|
+
payload.targetImage = imgName;
|
|
88
|
+
});
|
|
75
89
|
}
|
|
76
90
|
|
|
77
91
|
writing() {
|
|
78
|
-
this.payload.folderPrefixGitIgnore = this.payload.folderPrefix
|
|
79
|
-
? this.payload.folderPrefix + "*"
|
|
80
|
-
: "";
|
|
81
|
-
|
|
82
|
-
this.env.options.nodePackageManager = "yarn";
|
|
83
92
|
const { cp, chMainName } = YoHelper(this);
|
|
84
93
|
|
|
85
94
|
// handle change to new folder
|
|
@@ -95,5 +104,6 @@ module.exports = class extends YoGenerator {
|
|
|
95
104
|
cp("compile.sh", null, this.payload);
|
|
96
105
|
cp("install-packages.sh", null, this.payload);
|
|
97
106
|
cp("support", null, this.payload);
|
|
107
|
+
cp("bin", null, this.payload);
|
|
98
108
|
}
|
|
99
109
|
};
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
#!/bin/bash
|
|
2
2
|
|
|
3
|
+
###
|
|
4
|
+
# Environment ${INSTALL_VERSION} pass from Dockerfile
|
|
5
|
+
###
|
|
6
|
+
|
|
3
7
|
INSTALL=""
|
|
4
8
|
|
|
5
9
|
BUILD_DEPS=""
|
|
@@ -19,6 +23,8 @@ echo ""
|
|
|
19
23
|
|
|
20
24
|
apk add --virtual .build-deps $BUILD_DEPS && apk add $INSTALL
|
|
21
25
|
|
|
26
|
+
#/* put your install code here */#
|
|
27
|
+
|
|
22
28
|
apk del -f .build-deps && rm -rf /var/cache/apk/* || exit 1
|
|
23
29
|
|
|
24
30
|
exit 0
|