generator-reshow 0.17.50 → 0.17.51

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

@@ -25,7 +25,7 @@ jobs:
           command: |
             VER_PREFIX=$(support/VER_PREFIX.sh)
             DOCKER_FILES=$(support/DOCKER_FILES.sh)
-            BUILD_FOLDER=${VER_PREFIX}<< parameters.docker-tag >>
+            BUILD_FOLDER=${VER_PREFIX}-<< parameters.docker-tag >>
             ./support/build-multi.sh << parameters.docker-tag >>
             ls -la ${BUILD_FOLDER}
             for file in $DOCKER_FILES; do
@@ -43,7 +43,7 @@ jobs:
             VER_PREFIX=$(support/VER_PREFIX.sh)
             IMAGE_NAME=$(support/targetImage.sh)
             BUILD_VERSION=<< parameters.docker-tag >>
-            BUILD_FOLDER=${VER_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?
-<%= verPrefixGitIgnore %>
+/<%= verPrefixGitIgnore %>-

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

@@ -5,7 +5,7 @@ DIR="$(
   pwd -P
 )"
 
-FOLDER_PREFIX=$(${DIR}/FOLDER_PREFIX.sh)
+FOLDER_PREFIX=$(${DIR}/VER_PREFIX.sh)
 COPY_FILES=$(${DIR}/COPY_FILES.sh)
 DOCKER_FILES=$(${DIR}/DOCKER_FILES.sh)
 BUILD_VERSION=$1
@@ -17,14 +17,14 @@ fi
 
 do_build() {
   echo 'building --- Version: ' $BUILD_VERSION '-->'
-  DEST_FOLDER=${DIR}/../${FOLDER_PREFIX}${BUILD_VERSION}
-  mkdir -p ${DEST_FOLDER}
+  BUILD_FOLDER=${DIR}/../${FOLDER_PREFIX}-${BUILD_VERSION}
+  mkdir -p ${BUILD_FOLDER}
 
-  for file in $COPY_FILES; do [ -e "$file" ] && cp -a $file ${DEST_FOLDER}; done
+  for file in $COPY_FILES; do [ -e "$file" ] && cp -a $file ${BUILD_FOLDER}; done
   for file in $DOCKER_FILES; do
     if [ -e "$file" ]; then
-      cp $file ${DEST_FOLDER}
-      DEST_FILE=${DEST_FOLDER}/$file
+      cp $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
     fi

package/package.json

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