generator-reshow 0.17.75 → 0.17.77

package/generators/docker/index.js

@@ -26,7 +26,7 @@ module.exports = class extends YoGenerator {
    * https://github.com/SBoudrias/Inquirer.js
    */
   async prompting() {
-    const { say, handleAnswers, promptChainAll } = YoHelper(this);
+    const { handleAnswers, promptChainAll } = YoHelper(this);
 
     const prompts = [
       ...commonPrompt.mainName(this),

package/generators/docker/templates/Dockerfile

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

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

@@ -3,18 +3,24 @@ version: 2.1
 commands:
   install-docker-buildx:
     description: Install Docker Buildx
+    parameters:
+      docker-tag:
+        type: string
+      buildx-version:
+        type: string
+        default: v0.11.2
     steps:
       - run:
           name: Install Docker Buildx
           command: |
             mkdir -vp ~/.docker/cli-plugins/
-            curl --silent -L "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-amd64" > ~/.docker/cli-plugins/docker-buildx
+            curl --silent -L "https://github.com/docker/buildx/releases/download/<< parameters.buildx-version >>/buildx-<< parameters.buildx-version >>.linux-amd64" > ~/.docker/cli-plugins/docker-buildx
             chmod a+x ~/.docker/cli-plugins/docker-buildx
             docker buildx version
             sudo apt-get update && sudo apt-get install -y binfmt-support qemu-user-static
             docker run --rm --privileged tonistiigi/binfmt --install arm64
             docker context create buildcontext
-            docker buildx create buildcontext --use
+            docker buildx create --name joyful-<< parameters.docker-tag >>- --append buildcontext --use
 
 executors:
   docker-publisher:
@@ -29,7 +35,7 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker:
-          version: 20.10.18
+          version: 20.10.24
           docker_layer_caching: true
       - run:
           name: "Test with terratest"
@@ -46,7 +52,7 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker:
-          version: 20.10.18
+          version: 20.10.24
           docker_layer_caching: true
       - run:
           name: Log time
@@ -68,10 +74,8 @@ jobs:
               cat ${BUILD_FOLDER}/$file
               echo ""
             done
-      - install-docker-buildx
-      - run:
-          name: login
-          command: ./compile.sh login
+      - install-docker-buildx:
+          docker-tag: << parameters.docker-tag >>
       - run:
           name: build Docker image
           command: |
@@ -90,15 +94,23 @@ jobs:
                 LATEST_TAG="-t $IMAGE_NAME:latest"
             fi
             echo "Build ARGS: ${BUILD_ARG}"
+            docker pull $IMAGE_NAME:${BUILD_VERSION} || true
             docker buildx inspect --bootstrap
+            echo "# ------ Start to Login ------ #"
+            ./compile.sh login
+            ./compile.sh rate
+            echo "# ------ End to Login ------ #"
             docker buildx build ${BUILD_ARG} -f ${BUILD_FOLDER}/Dockerfile \
+              --cache-to=type=inline,mode=all \
+              --cache-from $IMAGE_NAME:${BUILD_VERSION} \
               --push \
+              --progress=plain \
               --platform linux/amd64,linux/arm64/v8 \
               -t $IMAGE_NAME:${BUILD_VERSION} ${LATEST_TAG} \
               ./${BUILD_FOLDER}
             ./compile.sh updateDockerHubDesc
       - run:
-          name: logout 
+          name: logout
           command: docker logout
 
 workflows:

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

@@ -20,7 +20,7 @@ containerName=${localImage//\//-}-${pid}
 echo $containerName
 
 cli='env docker run --rm -it'
-cli+=" -v $DIR/../docker/entrypoint.sh:/entrypoint.sh"
+cli+=" -v $DIR/../docker/sbin:/usr/local/sbin"
 cli+=" -v $MY_PWD:$MY_PWD"
 cli+=" -w $MY_PWD"
 cli+=" --entrypoint sh"

package/generators/docker/templates/compile.sh

@@ -74,6 +74,14 @@ updateDockerHubDesc() {
   echo $RESULT
 }
 
+getRateLimit() {
+  # https://docs.docker.com/docker-hub/download-rate-limit/
+  token=$(curl -s --user "${DOCKER_LOGIN}:${DOCKER_PASSWORD}" "https://auth.docker.io/token?service=registry.docker.io&scope=repository:ratelimitpreview/test:pull" | jq -r .token)
+  curl -s -I \
+    -H "Authorization: Bearer $token" \
+    "https://registry-1.docker.io/v2/ratelimitpreview/test/manifests/latest" | grep "ratelimit-"
+}
+
 push() {
   login
   PUSH_VERSION=${1:-$VERSION}
@@ -147,6 +155,9 @@ case "$1" in
   updateDockerHubDesc)
     updateDockerHubDesc
     ;;
+  rate)
+    getRateLimit
+    ;;
   p)
     push $2 $3
     ;;

package/generators/docker/templates/docker/{entrypoint.sh → sbin/entrypoint.sh}

@@ -2,7 +2,7 @@
 
 # docker entrypoint script
 server() {
-  tail -f /entrypoint.sh
+  tail -f /usr/local/sbin/entrypoint.sh
 }
 
 if [ "$1" = 'server' ]; then

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

@@ -33,5 +33,6 @@ apk add --virtual .build-deps $BUILD_DEPS && apk add $INSTALL --upgrade $UPGRADE
 #/* put your install code here */#
 
 apk del -f .build-deps && rm -rf /var/cache/apk/* || exit 1
+echo $(date +%Y%m%d%S)'-'$TARGETPLATFORM > /build_version
 
 exit 0

package/generators/npm/index.js

@@ -55,7 +55,7 @@ module.exports = class extends YoGenerator {
   writing() {
     this.env.options.nodePackageManager = "yarn";
     const { cp, chMainName } = YoHelper(this);
-    const { isUseBabel, isUseBabelUI } = this.payload || {};
+    const { isUseBabel, isUseBabelUI, babelRootMode } = this.payload || {};
 
     // handle change to new folder
     chMainName(this.mainName);
@@ -64,7 +64,9 @@ module.exports = class extends YoGenerator {
     cp("README.md", null, this.payload);
     cp(".gitignore", null, this.payload);
     if (isUseBabel) {
-      cp("babel.config.js");
+      if (null == babelRootMode) {
+        cp("babel.config.js");
+      }
       if (isUseBabelUI) {
         cp("ui-src", "src");
         cp("UITest.js", "src/ui/pages/__tests__/IndexTest.js", this.payload);

package/package.json

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