generator-reshow 0.17.6 → 0.17.9

package/generators/docker/README.md

@@ -1,9 +1,8 @@
 # `docker`
 
-> TODO: description 
+> Docker generator 
 
 ## Usage
 
 ```
-npx yonpx docker
 ```

package/generators/docker/index.js

@@ -35,7 +35,7 @@ module.exports = class extends YoGenerator {
 
     const prompts = [
       ...commonPrompt.mainName(this),
-      ...commonPrompt.desc(this, {keyword: false}),
+      ...commonPrompt.desc(this, { keyword: false }),
       ...commonPrompt.repository(this, {
         defaultRepositoryName: "[REPOSITORY_NAME]",
         defaultRepositoryOrgName: "[REPOSITORY_ORG_NAME]",
@@ -71,15 +71,24 @@ module.exports = class extends YoGenerator {
     const answers = await mergePromptOrOption(prompts, (nextPrompts) =>
       promptChain(promptChainLocator(nextPrompts))
     );
-    handleAnswers(answers);
+    handleAnswers(answers, (payload) => {
+      // add more payload
+      payload.folderPrefixGitIgnore = payload.folderPrefix
+        ? payload.folderPrefix + "*"
+        : "";
+      let imgName = payload.mainName;
+      if (payload.dockerImageName) {
+        imgName = payload.dockerImageName;
+        if (payload.dockerOrgName) {
+          imgName = `${payload.dockerOrgName}/${payload.dockerImageName}`;
+        }
+      }
+      payload.sourceImage = imgName; 
+      payload.targetImage = imgName; 
+    });
   }
 
   writing() {
-    this.payload.folderPrefixGitIgnore = this.payload.folderPrefix
-      ? this.payload.folderPrefix + "*"
-      : "";
-
-    this.env.options.nodePackageManager = "yarn";
     const { cp, chMainName } = YoHelper(this);
 
     // handle change to new folder

package/generators/docker/templates/.env.build

@@ -1,4 +1,4 @@
-sourceImage=<%= mainName %>
-targetImage=<%= mainName %>
+sourceImage=<%= sourceImage %>
+targetImage=<%= targetImage %>
 VERSION=0.0
 FOLDER_PREFIX=<%= folderPrefix %>

package/generators/docker/templates/Dockerfile

@@ -2,6 +2,8 @@ ARG VERSION=${VERSION:-[VERSION]}
 
 FROM alpine:3.15
 
+ARG VERSION
+
 # apk
 COPY ./install-packages.sh /usr/local/bin/
 RUN apk update && apk add bash bc \

package/generators/docker/templates/_circleci/config.yml

@@ -11,9 +11,6 @@ jobs:
     parameters:
       docker-tag:
         type: string
-      folder-prefix:
-        type: string
-        default: "<%= folderPrefix %>"
     executor: docker-publisher
     steps:
       - checkout
@@ -26,15 +23,16 @@ jobs:
       - run:
           name: Gen Docker file
           command: |
+            FOLDER_PREFIX=$(support/FOLDER_PREFIX.sh)
             ./build.sh << parameters.docker-tag >>
-            ls -la << parameters.folder-prefix >><< parameters.docker-tag >>
+            ls -la ${FOLDER_PREFIX}<< parameters.docker-tag >>
       - run:
           name: build Docker image
           command: |
-            VERSION=$(support/VERSION.sh)
+            FOLDER_PREFIX=$(support/FOLDER_PREFIX.sh)
             IMAGE_NAME=$(support/targetImage.sh)
             BUILD_VERSION=<< parameters.docker-tag >>
-            BUILD_FOLDER=<< parameters.folder-prefix >><< parameters.docker-tag >>
+            BUILD_FOLDER=${FOLDER_PREFIX}<< parameters.docker-tag >>
             BUILD_ARG=""
             docker build ${BUILD_ARG} -f ${BUILD_FOLDER}/Dockerfile \
               -t $IMAGE_NAME:${BUILD_VERSION} \

package/generators/docker/templates/build.sh

@@ -6,17 +6,22 @@ DIR="$(
 )"
 
 FOLDER_PREFIX=$(${DIR}/support/FOLDER_PREFIX.sh)
+BUILD_VERSION=$1
+
+if [ -z "$BUILD_VERSION" ]; then
+  echo "Not set build version."
+  exit 1;
+fi
 
 do_build() {
-  SED_REPLACE_VER=$1
-  DEST_FOLDER=${DIR}/${FOLDER_PREFIX}${SED_REPLACE_VER}
+  DEST_FOLDER=${DIR}/${FOLDER_PREFIX}${BUILD_VERSION}
   mkdir -p ${DEST_FOLDER}
-  echo "building --- Version: " $SED_REPLACE_VER "-->"
+  echo 'building --- Version: ' $BUILD_VERSION '-->'
   DEST_FILE=${DEST_FOLDER}/Dockerfile
   cp Dockerfile ${DEST_FILE}
   cp install-packages.sh ${DEST_FOLDER}
-  sed -i -e "s|\[VERSION\]|$SED_REPLACE_VER|g" ${DEST_FILE}
+  sed -i -e "s|\[VERSION\]|$BUILD_VERSION|g" ${DEST_FILE}
   if [ -e "${DEST_FILE}-e" ]; then rm ${DEST_FILE}-e; fi
 }
 
-do_build $1
+do_build

package/generators/npm/__tests__/Test.js

@@ -19,6 +19,8 @@ describe("!! npm !!", () => {
         appNamee: "foo",
         description: "foo-desc",
         keyword: "foo-keyword",
+        repositoryName: "foo-repository-name",
+        repositoryOrgName: "foo-repository-org-name",
       },
     });
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-reshow",
-  "version": "0.17.6",
+  "version": "0.17.9",
   "description": "Yeoman generator for reshow. (app, generator, ...etc)",
   "author": "Hill <hill@kimo.com>",
   "repository": {