generator-reshow 0.17.48 → 0.17.49

package/generators/app/__tests__/TestApp.js

@@ -16,7 +16,6 @@ describe("generator-reshow:app", () => {
       source: __dirname + "/../.",
       params: {
         isReady: true,
-        appNamee: "foo",
         description: "foo-desc",
         keyword: "foo-keyword",
       },

package/generators/app/index.js

@@ -30,6 +30,7 @@ module.exports = class extends YoGenerator {
     const prompts = [
       ...commonPrompt.mainName(this),
       ...commonPrompt.desc(this),
+      ...commonPrompt.author(this),
     ];
     const answers = await this.prompt(prompts);
     handleAnswers(answers);

package/generators/compile-sh/__tests__/Test.js

@@ -16,7 +16,6 @@ describe("!! compile-sh !!", () => {
       source: __dirname + "/../.",
       params: {
         isReady: true,
-        appNamee: "foo",
         description: "foo-desc",
         keyword: "foo-keyword",
       },

package/generators/docker/__tests__/Test.js

@@ -16,7 +16,6 @@ describe("!! docker !!", () => {
       source: __dirname + "/../.",
       params: {
         isReady: true,
-        appNamee: "foo",
         description: "foo-desc",
       },
     });

package/generators/docker/commonDockerPrompt.js

@@ -0,0 +1,24 @@
+const commonDockerPrompt = (oGen) => {
+  return [
+    {
+      type: "input",
+      name: "dockerImageName",
+      message: "Please input your docker-image-name?",
+      default: "[DOCKER_IMAGE_NAME]",
+    },
+    {
+      type: "input",
+      name: "dockerOrgName",
+      message: "Please input your docker-org-name?",
+      default: "[DOCKER_ORG_NAME]",
+    },
+    {
+      type: "input",
+      name: "verPrefix",
+      message: "Please input your version-prefix, will use with folder name and version?",
+      default: "v",
+    },
+  ];
+};
+
+module.exports = commonDockerPrompt;

package/generators/docker/index.js

@@ -1,4 +1,5 @@
 const { YoGenerator, YoHelper, commonPrompt } = require("yo-reshow");
+const commonDockerPrompt = require("./commonDockerPrompt");
 
 /**
  * docker Generator
@@ -25,13 +26,7 @@ module.exports = class extends YoGenerator {
    * https://github.com/SBoudrias/Inquirer.js
    */
   async prompting() {
-    const {
-      say,
-      handleAnswers,
-      mergePromptOrOption,
-      promptChainLocator,
-      promptChain,
-    } = YoHelper(this);
+    const { say, handleAnswers, promptChainAll } = YoHelper(this);
 
     const prompts = [
       ...commonPrompt.mainName(this),
@@ -40,23 +35,12 @@ module.exports = class extends YoGenerator {
         defaultRepositoryName: "[REPOSITORY_NAME]",
         defaultRepositoryOrgName: "[REPOSITORY_ORG_NAME]",
       }),
+      ...commonDockerPrompt(this),
       {
         type: "input",
-        name: "dockerImageName",
-        message: "Please input your docker-image-name?",
-        default: "[DOCKER_IMAGE_NAME]",
-      },
-      {
-        type: "input",
-        name: "dockerOrgName",
-        message: "Please input your docker-org-name?",
-        default: "[DOCKER_ORG_NAME]",
-      },
-      {
-        type: "input",
-        name: "folderPrefix",
-        message: "Please input your folder-prefix?",
-        default: "ver-",
+        name: "terratest",
+        message: "Please input terratest docker image name?",
+        default: "terratest",
       },
       /*
       {
@@ -68,14 +52,10 @@ module.exports = class extends YoGenerator {
       */
     ];
 
-    const answers = await mergePromptOrOption(prompts, (nextPrompts) =>
-      promptChain(promptChainLocator(nextPrompts))
-    );
+    const answers = await promptChainAll(prompts);
     handleAnswers(answers, (payload) => {
       // add more payload
-      payload.folderPrefixGitIgnore = payload.folderPrefix
-        ? payload.folderPrefix + "*"
-        : "";
+      payload.verPrefixGitIgnore = payload.verPrefix ? payload.verPrefix + "*" : "";
       let imgName = payload.mainName;
       if (payload.dockerImageName) {
         imgName = payload.dockerImageName;
@@ -83,8 +63,8 @@ module.exports = class extends YoGenerator {
           imgName = `${payload.dockerOrgName}/${payload.dockerImageName}`;
         }
       }
-      payload.sourceImage = imgName; 
-      payload.targetImage = imgName; 
+      payload.localImage = imgName;
+      payload.remoteImage = imgName;
     });
   }
 
@@ -95,15 +75,18 @@ module.exports = class extends YoGenerator {
     chMainName();
 
     // handle copy file
-    cp(".env.build", null, this.payload);
-    cp("Dockerfile", null, this.payload);
-    cp("README.md", null, this.payload);
+    if (!this.options.fromGitlab) {
+      cp("Dockerfile", null, this.payload);
+      cp("README.md", null, this.payload);
+    }
     cp("_circleci", ".circleci", this.payload);
+    cp(".env.build", null, this.payload);
     cp("_gitignore", ".gitignore", this.payload);
-    cp("build.sh", null, this.payload);
     cp("compile.sh", null, this.payload);
     cp("install-packages.sh", null, this.payload);
     cp("support", null, this.payload);
     cp("bin", null, this.payload);
+    cp("docker", null, this.payload);
+    cp("test", null, this.payload);
   }
 };

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

@@ -1,6 +1,8 @@
-sourceImage=<%= sourceImage %>
-targetImage=<%= targetImage %>
-VERSION=0.0
-FOLDER_PREFIX=<%= folderPrefix %>
+localImage=<%= localImage %>
+remoteImage=<%= remoteImage %>
+TERRATEST=<%= terratest %>
+VERSION=0.0.0
+VER_PREFIX=<%= verPrefix %>
 COPY_FILES[]=install-packages.sh
+COPY_FILES[]=docker
 DOCKER_FILES[]=Dockerfile

package/generators/docker/templates/Dockerfile

@@ -9,3 +9,7 @@ COPY ./install-packages.sh /usr/local/bin/install-packages
 RUN apk update && apk add bash bc \
   && INSTALL_VERSION=$VERSION install-packages \
   && rm /usr/local/bin/install-packages;
+
+COPY ./docker/entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["server"]

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

@@ -23,27 +23,27 @@ jobs:
       - run:
           name: Gen Docker file
           command: |
-            FOLDER_PREFIX=$(support/FOLDER_PREFIX.sh)
+            VER_PREFIX=$(support/VER_PREFIX.sh)
             DOCKER_FILES=$(support/DOCKER_FILES.sh)
-            FOLDER=${FOLDER_PREFIX}<< parameters.docker-tag >>
-            ./build.sh << parameters.docker-tag >>
-            ls -la ${FOLDER}
+            BUILD_FOLDER=${VER_PREFIX}<< parameters.docker-tag >>
+            ./support/build-multi.sh << parameters.docker-tag >>
+            ls -la ${BUILD_FOLDER}
             for file in $DOCKER_FILES; do
               echo ""
               echo "###"
               echo "# --- Dockerfile ($file) Content ---"
               echo "###"
               echo ""
-              cat ${FOLDER}/$file
+              cat ${BUILD_FOLDER}/$file
               echo ""
             done
       - run:
           name: build Docker image
           command: |
-            FOLDER_PREFIX=$(support/FOLDER_PREFIX.sh)
+            VER_PREFIX=$(support/VER_PREFIX.sh)
             IMAGE_NAME=$(support/targetImage.sh)
             BUILD_VERSION=<< parameters.docker-tag >>
-            BUILD_FOLDER=${FOLDER_PREFIX}<< parameters.docker-tag >>
+            BUILD_FOLDER=${VER_PREFIX}<< parameters.docker-tag >>
             BUILD_ARG=""
             docker build ${BUILD_ARG} -f ${BUILD_FOLDER}/Dockerfile \
               -t $IMAGE_NAME:${BUILD_VERSION} \

package/generators/docker/templates/_gitignore

@@ -1,3 +1,3 @@
 archive.tar
 .*.sw?
-<%= folderPrefixGitIgnore %>
+<%= verPrefixGitIgnore %>

package/generators/docker/templates/bin/enter.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env sh
+
+DIR="$(
+  cd "$(dirname "$0")"
+  pwd -P
+)"
+MY_PWD=$(pwd)
+
+localImage=$(${DIR}/../support/localImage.sh)
+
+C=''
+for i in "$@"; do
+  i="${i//\\/\\\\}"
+  C="$C \"${i//\"/\\\"}\""
+done
+
+pid=$$
+
+cli='env docker run --rm -it'
+cli+=" -v $DIR/../docker/entrypoint.sh:/entrypoint.sh"
+cli+=" -v $MY_PWD:$MY_PWD"
+cli+=" -w $MY_PWD"
+cli+=" --name ${localImage}-${pid} ${localImage}"
+cli+=" sh ${C}"
+
+sh -c "$cli"

package/generators/docker/templates/bin/run.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env sh
+
+DIR="$(
+  cd "$(dirname "$0")"
+  pwd -P
+)"
+
+localImage=$(${DIR}/../support/localImage.sh)
+pid=$$
+folderName=${PWD##*/}
+
+cli='env docker run --rm -it'
+cli+=" --name ${folderName}-${pid} ${localImage}"
+echo $cli
+sh -c "$cli"

package/generators/docker/templates/bin/test.sh

@@ -1,13 +1,15 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 DIR="$(
   cd "$(dirname "$0")"
   pwd -P
 )"
-sourceImage=$(${DIR}/../support/sourceImage.sh)
-pid=$$
-folderName=${PWD##*/}
-
-cli='env docker run --rm -it'
-cli+=" --name ${folderName}_${pid} ${sourceImage}"
-echo $cli
-bash -c "$cli"
+
+TERRATEST=$(${DIR}/../support/TERRATEST.sh)
+
+docker run --rm -v $DIR/../:/app/test \
+  -v /var/run/docker.sock:/var/run/docker.sock \
+  -w /app/test \
+  $TERRATEST \
+  go test -v ./test
+
+

package/generators/docker/templates/compile.sh

@@ -1,11 +1,11 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 DIR="$(
   cd "$(dirname "$0")"
   pwd -P
 )"
-sourceImage=$(${DIR}/support/sourceImage.sh)
-targetImage=$(${DIR}/support/targetImage.sh)
+localImage=$(${DIR}/support/localImage.sh)
+remoteImage=$(${DIR}/support/remoteImage.sh)
 archiveFile=$DIR/archive.tar
 VERSION=$(${DIR}/support/VERSION.sh)
 DOCKER_FILE=${DOCKER_FILE:-Dockerfile}
@@ -25,7 +25,7 @@ tag() {
   fi
   echo "* <!-- Start to tag: ${tag}"
   echo $tag
-  docker tag $sourceImage ${targetImage}:$tag
+  docker tag ${localImage} ${remoteImage}:$tag
   list
   echo "* Finish tag -->"
 }
@@ -41,20 +41,20 @@ push() {
       tag=$LATEST_TAG-$PUSH_VERSION
     fi
   fi
-  echo "* <!-- Start to push ${targetImage}:$tag"
+  echo "* <!-- Start to push ${remoteImage}:$tag"
   IS_LOGIN=$(echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_LOGIN" --password-stdin)
   if ! [[ $IS_LOGIN =~ "Succeeded" ]]; then
     echo "Login Failed."
     exit 1
   fi
-  docker push ${targetImage}:$tag
+  docker push ${remoteImage}:$tag
   echo "* Finish pushed -->"
   echo ""
   if [ ! -z "$1" ]; then
     if [ "x$VERSION" == "x$PUSH_VERSION" ]; then
-      echo "* <!-- Start to auto push ${targetImage}:${LATEST_TAG}"
-      docker tag ${targetImage}:$tag ${targetImage}:${LATEST_TAG}
-      docker push ${targetImage}:${LATEST_TAG}
+      echo "* <!-- Start to auto push ${remoteImage}:${LATEST_TAG}"
+      docker tag ${remoteImage}:$tag ${remoteImage}:${LATEST_TAG}
+      docker push ${remoteImage}:${LATEST_TAG}
       echo "* Finish pushed -->"
     fi
   fi
@@ -77,18 +77,18 @@ build() {
   if [ "x" != "x$NO_CACHE" ]; then
     echo nocache: ${NO_CACHE}
   fi
-  docker build ${BUILD_ARG} ${NO_CACHE} -f ${DIR}/${DOCKER_FILE} -t $sourceImage ${DIR}
+  docker build ${BUILD_ARG} ${NO_CACHE} -f ${DIR}/${DOCKER_FILE} -t $localImage ${DIR}
   list
 }
 
 save() {
   echo save
-  docker save $sourceImage > $archiveFile
+  docker save $localImage > $archiveFile
 }
 
 restore() {
   echo restore
-  docker save --output $archiveFile $sourceImage
+  docker save --output $archiveFile $localImage
 }
 
 case "$1" in

package/generators/docker/templates/docker/entrypoint.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env sh
+
+# docker entrypoint script
+server() {
+  tail -f /entrypoint.sh
+}
+
+if [ "$1" = 'server' ]; then
+  server
+else
+  exec "$@"
+fi

package/generators/docker/templates/install-packages.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 ###
 # Environment ${INSTALL_VERSION} pass from Dockerfile

package/generators/docker/templates/support/COPY_FILES.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env sh
 
 DIR="$(
   cd "$(dirname "$0")"

package/generators/docker/templates/support/DOCKER_FILES.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env sh
 
 DIR="$(
   cd "$(dirname "$0")"

package/generators/docker/templates/support/TERRATEST.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+DIR="$(
+  cd "$(dirname "$0")"
+  pwd -P
+)"
+
+ENV=${DIR}/../.env.build
+
+if [ -z "$TERRATEST" ]; then
+  TERRATEST=$(awk -F "=" '/^TERRATEST/ {print $2}' $ENV)
+fi
+
+echo $TERRATEST

package/generators/docker/templates/support/VERSION.sh

@@ -1,5 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env sh
+
 DIR="$( cd "$(dirname "$0")" ; pwd -P )"
+
 ENV=${DIR}/../.env.build
 
 if [ -z $VERSION ]; then

package/generators/docker/templates/support/VER_PREFIX.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+DIR="$(
+  cd "$(dirname "$0")"
+  pwd -P
+)"
+
+ENV=${DIR}/../.env.build
+
+if [ -z "$VER_PREFIX" ]; then
+  VER_PREFIX=$(awk -F "=" '/^VER_PREFIX/ {print $2}' $ENV)
+fi
+
+echo $VER_PREFIX

package/generators/docker/templates/{build.sh → support/build-multi.sh}

@@ -1,13 +1,13 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 DIR="$(
   cd "$(dirname "$0")"
   pwd -P
 )"
 
-FOLDER_PREFIX=$(${DIR}/support/FOLDER_PREFIX.sh)
-COPY_FILES=$(${DIR}/support/COPY_FILES.sh)
-DOCKER_FILES=$(${DIR}/support/DOCKER_FILES.sh)
+FOLDER_PREFIX=$(${DIR}/FOLDER_PREFIX.sh)
+COPY_FILES=$(${DIR}/COPY_FILES.sh)
+DOCKER_FILES=$(${DIR}/DOCKER_FILES.sh)
 BUILD_VERSION=$1
 
 if [ -z "$BUILD_VERSION" ]; then
@@ -17,7 +17,7 @@ fi
 
 do_build() {
   echo 'building --- Version: ' $BUILD_VERSION '-->'
-  DEST_FOLDER=${DIR}/${FOLDER_PREFIX}${BUILD_VERSION}
+  DEST_FOLDER=${DIR}/../${FOLDER_PREFIX}${BUILD_VERSION}
   mkdir -p ${DEST_FOLDER}
 
   for file in $COPY_FILES; do [ -e "$file" ] && cp -a $file ${DEST_FOLDER}; done

package/generators/docker/templates/support/localImage.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+DIR="$(
+  cd "$(dirname "$0")"
+  pwd -P
+)"
+
+ENV=${DIR}/../.env.build
+
+if [ -z "$localImage" ]; then
+  localImage=$(awk -F "=" '/^localImage/ {print $2}' $ENV)
+fi
+
+echo $localImage

package/generators/docker/templates/support/remoteImage.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+DIR="$(
+  cd "$(dirname "$0")"
+  pwd -P
+)"
+
+ENV=${DIR}/../.env.build
+
+if [ -z "$remoteImage" ]; then
+  remoteImage=$(awk -F "=" '/^remoteImage/ {print $2}' $ENV)
+fi
+
+echo $remoteImage

package/generators/docker/templates/test/smoke_test.go

@@ -0,0 +1,23 @@
+package test
+
+import (
+	"testing"
+	"github.com/gruntwork-io/terratest/modules/docker"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestSmoke(t *testing.T) {
+	// website::tag::1:: Configure the tag to use on the Docker image.
+	tag := "docker-smoke"
+	buildOptions := &docker.BuildOptions{
+		Tags: []string{tag},
+	}
+
+	// website::tag::2:: Build the Docker image.
+	docker.Build(t, "../", buildOptions)
+
+	// website::tag::3:: Run the Docker image.
+	opts := &docker.RunOptions{Command: []string{"ls", "/"}}
+	output := docker.Run(t, tag, opts)
+	assert.Contains(t, output, "etc")
+}

package/generators/generator/__tests__/TestGenerator.js

@@ -16,7 +16,6 @@ describe("!! generator !!", () => {
       source: __dirname + "/../.",
       params: {
         isReady: true,
-        mainNamee: "foo",
         description: "foo-desc",
         keyword: "foo-keyword",
       },

package/generators/generator/templates/Test.js

@@ -16,7 +16,6 @@ describe("!! <%= mainName %> !!", () => {
       source: __dirname + "/../.",
       params: {
         isReady: true,
-        appNamee: "foo",
         description: "foo-desc",
         keyword: "foo-keyword",
       },

package/generators/gitlab-docker/README.md

@@ -0,0 +1,9 @@
+# `gitlab-docker`
+
+> TODO: description 
+
+## Usage
+
+```
+npx yonpx gitlab-docker
+```

package/generators/gitlab-docker/__tests__/Test.js

@@ -0,0 +1,43 @@
+/**
+ * https://yeoman.io/authoring/testing.html
+ * https://gilsondev.gitbooks.io/yeoman-authoring/content/authoring/unit_testing.html
+ *
+ * https://github.com/yeoman/yeoman-assert/blob/main/index.js
+ * https://github.com/yeoman/yeoman-test/blob/main/lib/run-context.js
+ */
+
+const { YoTest, assert } = require("yo-unit");
+
+describe("!! gitlab-docker !!", () => {
+  let runResult;
+
+  before(async () => {
+    runResult = await YoTest({
+      source: __dirname + "/../.",
+      params: {
+        isReady: true,
+        description: "foo-desc",
+        keyword: "foo-keyword",
+      },
+    });
+  });
+
+  after(() => {
+    if (runResult) {
+      runResult.restore();
+    }
+  });
+
+  it("should have folder", () => {
+    //    assert.file(["src", "ui"]);
+  });
+
+  it("should have file", () => {
+    assert.file([".gitlab-ci.yml", ".gitlab-trigger.yml"]);
+  });
+
+  it("should have content", () => {
+    //    assert.fileContent('composer.json', 'foo-desc');
+    //    assert.fileContent('.circleci/config.yml', 'foo');
+  });
+});

package/generators/gitlab-docker/index.js

@@ -0,0 +1,65 @@
+const { YoGenerator, YoHelper, commonPrompt } = require("yo-reshow");
+const commonDockerPrompt = require("../docker/commonDockerPrompt");
+
+/**
+ * gitlab-docker Generator
+ */
+module.exports = class extends YoGenerator {
+  /**
+   * Run loop (Life cycle)
+   * https://yeoman.io/authoring/running-context.html#the-run-loop
+   *
+   * 1. initializing
+   * 2. prompting
+   * 3. configuring
+   * 4. default
+   * 5. writing
+   * 6. conflicts
+   * 7. install
+   * 8. end
+   */
+
+  /**
+   * Questions.
+   *
+   * https://www.alwaystwisted.com/post.php?s=using-lists-in-a-yeoman-generator
+   * https://github.com/SBoudrias/Inquirer.js
+   */
+  async prompting() {
+    const {
+      handleAnswers,
+      promptChainAll,
+    } = YoHelper(this);
+
+    const prompts = [
+      ...commonPrompt.mainName(this),
+      ...commonPrompt.desc(this),
+      ...commonDockerPrompt(this),
+    ];
+
+    const answers = await promptChainAll(prompts);
+    handleAnswers(answers);
+    this.composeWith(require.resolve("../docker"), {
+      repositoryName: "",
+      repositoryOrgName: "",
+      description: "",
+      ...answers,
+      fromGitlab: true,
+    });
+  }
+
+  writing() {
+    this.env.options.nodePackageManager = "yarn";
+    this.options.skipInstall = true;
+    const { cp,  chMainName } = YoHelper(this);
+
+    // handle change to new folder
+    chMainName(this.mainName);
+
+    // handle copy file
+    cp("Dockerfile", null, this.payload);
+    cp("README.md", null, this.payload);
+    cp(".gitlab-ci.yml", null, this.payload);
+    cp(".gitlab-trigger.yml", null, this.payload);
+  }
+};

package/generators/gitlab-docker/templates/.gitlab-ci.yml

@@ -0,0 +1,79 @@
+stages:
+  - info
+  - test
+  - build
+  - uat
+  - deploy
+
+variables:
+  LATEST_TAG: <%= verPrefix %>0.0.0
+  LAST_IMAGE_STORE: ./last-image
+
+.parallel:
+  parallel:
+    matrix:
+      - dockerTag: [<%= verPrefix %>0.0.0]
+
+default:
+  before_script:
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+  after_script:
+    - docker logout
+  tags:
+    - swarm-cluster
+    - docker
+
+# https://docs.gitlab.com/ee/ci/yaml/index.html
+info-section:
+  # available stages are .pre, .post and form stages
+  stage: info
+  script:
+    - echo "Display Information"
+    - date
+    - echo "$CI_PIPELINE_ID"
+
+pre-test:
+  stage: test
+  image: $CI_TERRATEST
+  script:
+    - go test -v ./test
+
+build-docker-image:
+  extends: .parallel
+  stage: build
+  script:
+    - IMAGE_NAME=$CI_REGISTRY_IMAGE:$dockerTag-$CI_PIPELINE_ID
+    - echo $IMAGE_NAME > $LAST_IMAGE_STORE
+    - echo $IMAGE_NAME
+    - echo 'Start build docker images:' $dockerTag
+    - DOCKER_BUILDKIT=1 docker build -f Dockerfile --target $dockerTag -t $IMAGE_NAME .
+    - docker images | head -10 || trap '' PIPE
+    - docker push $IMAGE_NAME
+  artifacts:
+    paths:
+      - $LAST_IMAGE_STORE
+
+e2e-test:
+  stage: uat
+  needs: ["build-docker-image"]
+  trigger:
+    include:
+      - local: .gitlab-trigger.yml
+
+put-to-stable:
+  extends: .parallel
+  stage: deploy
+  rules:
+    - when: manual
+  script:
+    - STABLE_NAME=$CI_REGISTRY_IMAGE:$dockerTag
+    - echo 'Put Image to Stable:' $dockerTag
+    - IMAGE_NAME=$(cat $LAST_IMAGE_STORE)
+    - docker pull $IMAGE_NAME
+    - docker tag $IMAGE_NAME $STABLE_NAME
+    - docker push $STABLE_NAME
+    - |
+      if [ "x$LATEST_TAG" == "x$dockerTag" ]; then
+        docker tag $IMAGE_NAME $CI_REGISTRY_IMAGE:latest
+        docker push $CI_REGISTRY_IMAGE:latest
+      fi

package/generators/gitlab-docker/templates/.gitlab-trigger.yml

@@ -0,0 +1,14 @@
+image: alpine
+
+stages:
+  - test
+
+default:
+  tags:
+    - swarm-cluster
+    - docker
+
+test:
+  stage: test
+  script:
+    - cat /etc/alpine-release

package/generators/gitlab-docker/templates/Dockerfile

@@ -0,0 +1,18 @@
+ARG VERSION=${VERSION:-[VERSION]}
+
+FROM alpine:3.15 AS base
+
+ARG VERSION
+
+# apk
+COPY ./install-packages.sh /usr/local/bin/install-packages
+RUN apk update && apk add bash bc \
+  && INSTALL_VERSION=$VERSION install-packages \
+  && rm /usr/local/bin/install-packages;
+
+FROM base AS <%= verPrefix %>0.0.0
+RUN echo "<%= verPrefix %>0.0.0"
+
+COPY ./docker/entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["server"]

package/generators/gitlab-docker/templates/README.md

@@ -0,0 +1,15 @@
+# `<%= mainName %>`
+
+> <%= description %> 
+
+## `GIT`
+   * <%= repositoryUrl %>
+
+## `Docker hub`
+   * Docker Image: <%= dockerOrgName %>/<%= dockerImageName %>
+
+## Usage
+
+```
+
+```

package/generators/library/__tests__/Test.js

@@ -16,7 +16,6 @@ describe("!! library !!", () => {
       source: __dirname + "/../.",
       params: {
         isReady: true,
-        appNamee: "foo",
         description: "foo-desc",
         keyword: "foo-keyword",
       },

package/generators/npm/__tests__/Test.js

@@ -16,7 +16,6 @@ describe("!! npm !!", () => {
       source: __dirname + "/../.",
       params: {
         isReady: true,
-        appNamee: "foo",
         description: "foo-desc",
         keyword: "foo-keyword",
         repositoryName: "foo-repository-name",

package/generators/package-json/__tests__/Test.js

@@ -14,11 +14,12 @@ describe("!! package-json !!", () => {
   before(async () => {
     runResult = await YoTest({
       source: __dirname + "/../.",
-      params: {
+      options: {
         isReady: true,
-        appNamee: "foo",
         description: "foo-desc",
         keyword: "foo-keyword",
+        authorName: "foo-name",
+        authorEmail: "foo@foo.com",
       },
     });
   });

package/generators/package-json/index.js

@@ -13,6 +13,8 @@ module.exports = class extends YoGenerator {
       mainName: "",
       description: "",
       babelRootMode: "",
+      authorName: "",
+      authorEmail: "",
       ...this.payload,
       ...this.options,
       ...getDotYo(this.options),

package/generators/update-esm-export/__tests__/Test.js

@@ -16,7 +16,6 @@ describe("!! update-esm-export !!", () => {
       source: __dirname + "/../.",
       params: {
         isReady: true,
-        appNamee: "foo",
         description: "foo-desc",
         keyword: "foo-keyword",
       },

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.17.48",
+  "version": "0.17.49",
   "name": "generator-reshow",
   "repository": {
     "type": "git",

package/generators/docker/templates/enter

@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-DIR="$(
-  cd "$(dirname "$0")"
-  pwd -P
-)"
-VERSION=${VERSION:-latest}
-SOURCE_IMAGE=$(${DIR}/support/sourceImage.sh)
-
-C=''
-for i in "$@"; do
-  i="${i//\\/\\\\}"
-  C="$C \"${i//\"/\\\"}\""
-done
-
-pid=$$
-
-cli='env docker run --rm -it'
-cli+=" -v $DIR:$DIR"
-cli+=" -w $DIR"
-cli+=" --name ${SOURCE_IMAGE}-${pid} ${SOURCE_IMAGE}:${VERSION}"
-cli+=" sh ${C}"
-
-bash -c "$cli"

package/generators/docker/templates/support/FOLDER_PREFIX.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-DIR="$(
-  cd "$(dirname "$0")"
-  pwd -P
-)"
-ENV=${DIR}/../.env.build
-
-if [ -z $FOLDER_PREFIX ]; then
-  FOLDER_PREFIX=$(awk -F "=" '/^FOLDER_PREFIX/ {print $2}' $ENV)
-fi
-
-echo $FOLDER_PREFIX

package/generators/docker/templates/support/sourceImage.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-DIR="$(
-  cd "$(dirname "$0")"
-  pwd -P
-)"
-ENV=${DIR}/../.env.build
-
-if [ -z $sourceImage ]; then
-  sourceImage=$(awk -F "=" '/^sourceImage/ {print $2}' $ENV)
-fi
-
-echo $sourceImage

package/generators/docker/templates/support/targetImage.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-DIR="$(
-  cd "$(dirname "$0")"
-  pwd -P
-)"
-ENV=${DIR}/../.env.build
-
-if [ -z $targetImage ]; then
-  targetImage=$(awk -F "=" '/^targetImage/ {print $2}' $ENV)
-fi
-
-echo $targetImage