generator-reshow 0.17.6 → 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.
@@ -1,9 +1,8 @@
1
1
  # `docker`
2
2
 
3
- > TODO: description
3
+ > Docker generator
4
4
 
5
5
  ## Usage
6
6
 
7
7
  ```
8
- npx yonpx docker
9
8
  ```
@@ -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
@@ -1,4 +1,4 @@
1
- sourceImage=<%= mainName %>
2
- targetImage=<%= mainName %>
1
+ sourceImage=<%= sourceImage %>
2
+ targetImage=<%= targetImage %>
3
3
  VERSION=0.0
4
4
  FOLDER_PREFIX=<%= folderPrefix %>
@@ -31,7 +31,6 @@ jobs:
31
31
  - run:
32
32
  name: build Docker image
33
33
  command: |
34
- VERSION=$(support/VERSION.sh)
35
34
  IMAGE_NAME=$(support/targetImage.sh)
36
35
  BUILD_VERSION=<< parameters.docker-tag >>
37
36
  BUILD_FOLDER=<< parameters.folder-prefix >><< parameters.docker-tag >>
@@ -19,6 +19,8 @@ describe("!! npm !!", () => {
19
19
  appNamee: "foo",
20
20
  description: "foo-desc",
21
21
  keyword: "foo-keyword",
22
+ repositoryName: "foo-repository-name",
23
+ repositoryOrgName: "foo-repository-org-name",
22
24
  },
23
25
  });
24
26
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "generator-reshow",
3
- "version": "0.17.6",
3
+ "version": "0.17.7",
4
4
  "description": "Yeoman generator for reshow. (app, generator, ...etc)",
5
5
  "author": "Hill <hill@kimo.com>",
6
6
  "repository": {