generator-reshow 0.17.12 → 0.17.16

package/generators/docker/README.md

@@ -2,7 +2,9 @@
 
 > Docker generator 
 
-## Environment Variables 
-
+## Environment Variables
 * DOCKER_LOGIN
 * DOCKER_PASSWORD
+
+### circleci sample url
+* https://app.circleci.com/settings/project/github/[git-org]/[git-repository-name]/environment-variables

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

@@ -2,3 +2,5 @@ sourceImage=<%= sourceImage %>
 targetImage=<%= targetImage %>
 VERSION=0.0
 FOLDER_PREFIX=<%= folderPrefix %>
+COPY_FILES[]=install-packages.sh
+DOCKER_FILES[]=Dockerfile

package/generators/docker/templates/Dockerfile

@@ -7,5 +7,5 @@ ARG VERSION
 # apk
 COPY ./install-packages.sh /usr/local/bin/install-packages
 RUN apk update && apk add bash bc \
-  && INSTALL_VERSION=$VERSION install-packages.sh \
+  && INSTALL_VERSION=$VERSION install-packages \
   && rm /usr/local/bin/install-packages;

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

@@ -24,8 +24,19 @@ jobs:
           name: Gen Docker file
           command: |
             FOLDER_PREFIX=$(support/FOLDER_PREFIX.sh)
+            DOCKER_FILES=$(support/DOCKER_FILES.sh)
+            FOLDER=${FOLDER_PREFIX}<< parameters.docker-tag >>
             ./build.sh << parameters.docker-tag >>
-            ls -la ${FOLDER_PREFIX}<< parameters.docker-tag >>
+            ls -la ${FOLDER}
+            for file in $DOCKER_FILES; do
+              echo ""
+              echo "###"
+              echo "# --- Dockerfile ($file) Content ---"
+              echo "###"
+              echo ""
+              cat ${FOLDER}/$file
+              echo ""
+            done
       - run:
           name: build Docker image
           command: |

package/generators/docker/templates/build.sh

@@ -6,22 +6,29 @@ DIR="$(
 )"
 
 FOLDER_PREFIX=$(${DIR}/support/FOLDER_PREFIX.sh)
+COPY_FILES=$(${DIR}/support/COPY_FILES.sh)
+DOCKER_FILES=$(${DIR}/support/DOCKER_FILES.sh)
 BUILD_VERSION=$1
 
 if [ -z "$BUILD_VERSION" ]; then
   echo "Not set build version."
-  exit 1;
+  exit 1
 fi
 
 do_build() {
+  echo 'building --- Version: ' $BUILD_VERSION '-->'
   DEST_FOLDER=${DIR}/${FOLDER_PREFIX}${BUILD_VERSION}
   mkdir -p ${DEST_FOLDER}
-  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\]|$BUILD_VERSION|g" ${DEST_FILE}
-  if [ -e "${DEST_FILE}-e" ]; then rm ${DEST_FILE}-e; fi
+
+  for file in $COPY_FILES; do [ -e "$file" ] && cp $file ${DEST_FOLDER}; done
+  for file in $DOCKER_FILES; do
+    if [ -e "$file" ]; then
+      cp $file ${DEST_FOLDER}
+      DEST_FILE=${DEST_FOLDER}/$file
+      sed -i -e "s|\[VERSION\]|$BUILD_VERSION|g" ${DEST_FILE}
+      if [ -e "${DEST_FILE}-e" ]; then rm ${DEST_FILE}-e; fi
+    fi
+  done
 }
 
 do_build

package/generators/docker/templates/compile.sh

@@ -70,6 +70,9 @@ build() {
   if [ ! -z "$VERSION" ]; then
     BUILD_ARG="$BUILD_ARG --build-arg VERSION=${VERSION}"
   fi
+  if [ ! -z "$ALT_VERSION" ]; then
+    BUILD_ARG="$BUILD_ARG --build-arg ALT_VERSION=${ALT_VERSION}"
+  fi
   echo build: ${DIR}/${DOCKER_FILE}
   if [ "x" != "x$NO_CACHE" ]; then
     echo nocache: ${NO_CACHE}

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

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

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

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

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

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

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

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

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

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

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

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

package/package.json

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