generator-reshow 0.18.2 → 0.18.3

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

@@ -11,10 +11,10 @@ commands:
         default: v0.22.0
     steps:
       - run:
-          name: Install package
-          command: sudo apt-get update && sudo apt-get install -qq -y --no-install-recommends binfmt-support qemu-user-statico
+          name: Install Buildx package
+          command: sudo apt-get update && sudo apt-get install -qq -y --no-install-recommends binfmt-support qemu-user-static
       - run:
-          name: Init VM
+          name: Init Buildx VM
           command: |
             docker context create CIContext
             docker run --rm --privileged tonistiigi/binfmt --install arm64
@@ -24,7 +24,7 @@ commands:
             mkdir -vp ~/.docker/cli-plugins/
             curl --silent -L "https://github.com/docker/buildx/releases/download/<< parameters.buildx-version >>/buildx-<< parameters.buildx-version >>.linux-arm64" > ~/.docker/cli-plugins/docker-buildx
             chmod a+x ~/.docker/cli-plugins/docker-buildx
-            docker buildx create --name joyful-<< parameters.docker-tag >>- --append CIContext --use
+            docker buildx create --use --name joyful-<< parameters.docker-tag >>- CIContext
 
 executors:
   docker-publisher:
@@ -62,13 +62,16 @@ jobs:
           name: Log time
           command: date
       - run:
-          name: Gen Docker file
+          name: Copy Build Files
           command: |
-            VER_PREFIX=$(support/VER_PREFIX.sh)
-            DOCKER_FILES=$(support/DOCKER_FILES.sh)
-            BUILD_FOLDER=${VER_PREFIX}-<< parameters.docker-tag >>
             ./support/build-multi.sh << parameters.docker-tag >>
+      - run:
+          name: Dump docker file
+          command: |
+            VER_PREFIX=$(support/VER_PREFIX.sh)
+            BUILD_FOLDER=${VER_PREFIX}<< parameters.docker-tag >>
             ls -la ${BUILD_FOLDER}
+            DOCKER_FILES=$(support/DOCKER_FILES.sh)
             for file in $DOCKER_FILES; do
               echo ""
               echo "###"
@@ -88,7 +91,7 @@ jobs:
             ALT_VERSION=$(support/ALT_VERSION.sh)
             IMAGE_NAME=$(DOCKER_HUB=1 support/remoteImage.sh)
             BUILD_VERSION=<< parameters.docker-tag >>
-            BUILD_FOLDER=${VER_PREFIX}-<< parameters.docker-tag >>
+            BUILD_FOLDER=${VER_PREFIX}<< parameters.docker-tag >>
             BUILD_ARG=""
             LATEST_TAG=""
             if [ "x$VERSION" == "x$BUILD_VERSION" ]; then

package/generators/docker/templates/compile.sh

@@ -7,7 +7,7 @@ DIR="$(
 
 localImage=$(${DIR}/support/localImage.sh)
 remoteImage=$(${DIR}/support/remoteImage.sh)
-dockerHubImage=$(DOCKER_HUB=1 support/remoteImage.sh)
+dockerHubImage=$(DOCKER_HUB=1 ${DIR}/support/remoteImage.sh)
 archiveFile=$DIR/archive.tar
 VERSION=$(${DIR}/support/VERSION.sh)
 ALT_VERSION=$(${DIR}/support/ALT_VERSION.sh)
@@ -41,6 +41,9 @@ login() {
     echo ${IS_LOGIN}
     echo "Login not Succeeded."
     exit 2
+  else
+    echo "Login Succeeded."
+    exit 0
   fi
 }
 
@@ -61,6 +64,12 @@ getToken() {
 }
 
 updateDockerHubDesc() {
+  DIR="$(
+    cd "$(dirname "$0")"
+    pwd -P
+  )"
+  remoteImage=$(${DIR}/support/remoteImage.sh)
+  dockerHubImage=$(DOCKER_HUB=1 ${DIR}/support/remoteImage.sh)
   token=$(getToken)
   if [ -e "README.md" ]; then
     full_description=$(jq -s -R . README.md)

package/generators/docker/templates/support/build-multi.sh

@@ -15,15 +15,22 @@ if [ -z "$BUILD_VERSION" ]; then
   exit 1
 fi
 
+copyfile() {
+  src=$1
+  dest=$2
+  dir_path=$(dirname "$src")
+  mkdir -p $dest/$dir_path
+  cp -a $src $dest/$dir_path
+}
+
 do_build() {
   echo 'building --- Version: ' $BUILD_VERSION '-->'
-  BUILD_FOLDER=${DIR}/../${FOLDER_PREFIX}-${BUILD_VERSION}
-  mkdir -p ${BUILD_FOLDER}
+  BUILD_FOLDER=${DIR}/../${FOLDER_PREFIX}${BUILD_VERSION}
 
-  for file in $COPY_FILES; do [ -e "$file" ] && cp -a $file ${BUILD_FOLDER}; done
+  for file in $COPY_FILES; do [ -e "$file" ] && copyfile $file ${BUILD_FOLDER}; done
   for file in $DOCKER_FILES; do
     if [ -e "$file" ]; then
-      cp $file ${BUILD_FOLDER}
+      copyfile $file ${BUILD_FOLDER}
       DEST_FILE=${BUILD_FOLDER}/$file
       sed -i -e "s|\[VERSION\]|$BUILD_VERSION|g" ${DEST_FILE}
       if [ -e "${DEST_FILE}-e" ]; then rm ${DEST_FILE}-e; fi

package/package.json

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