generator-reshow 0.17.59 → 0.17.61

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

@@ -53,10 +53,16 @@ jobs:
           name: build Docker image
           command: |
             VER_PREFIX=$(support/VER_PREFIX.sh)
+            VERSION=$(support/VERSION.sh)
+            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_ARG=""
+            if [ "x$VERSION" == "x$BUILD_VERSION" ]; then
+                BUILD_ARG="--build-arg ALT_VERSION=${ALT_VERSION}"
+            fi
+            echo "Build ARGS: ${BUILD_ARG}"
             docker build ${BUILD_ARG} -f ${BUILD_FOLDER}/Dockerfile \
               -t $IMAGE_NAME:${BUILD_VERSION} \
               ./${BUILD_FOLDER}

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

@@ -19,7 +19,7 @@ containerName=${localImage//\//-}-${pid}
 
 echo $containerName
 
-cli='env docker run --rm -it'
+cli='env docker run --rm -it --platform linux/amd64'
 cli+=" -v $DIR/../docker/entrypoint.sh:/entrypoint.sh"
 cli+=" -v $MY_PWD:$MY_PWD"
 cli+=" -w $MY_PWD"

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

@@ -9,7 +9,7 @@ localImage=$(${DIR}/../support/localImage.sh)
 pid=$$
 folderName=${PWD##*/}
 
-cli='env docker run --rm -it'
+cli='env docker run --rm -it --platform linux/amd64'
 cli+=" -v $DIR/../docker/entrypoint.sh:/entrypoint.sh"
 cli+=" --name ${folderName}-${pid} ${localImage}"
 echo $cli

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

@@ -6,10 +6,10 @@ DIR="$(
 
 TERRATEST=$(${DIR}/../support/TERRATEST.sh)
 
-docker run --rm -v $DIR/../:/app/test \
+docker run --rm --platform linux/amd64 -v $DIR/../:/app/test \
   -v /var/run/docker.sock:/var/run/docker.sock \
   -w /app/test \
   $TERRATEST \
-  go test -v ./tests
+  go test -timeout 30m -v ./tests
 
 

package/generators/docker/templates/compile.sh

@@ -9,6 +9,7 @@ localImage=$(${DIR}/support/localImage.sh)
 remoteImage=$(${DIR}/support/remoteImage.sh)
 archiveFile=$DIR/archive.tar
 VERSION=$(${DIR}/support/VERSION.sh)
+ALT_VERSION=$(${DIR}/support/ALT_VERSION.sh)
 DOCKER_FILE=${DOCKER_FILE:-Dockerfile}
 
 list() {

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

@@ -4,21 +4,21 @@
 # Environment ${INSTALL_VERSION} pass from Dockerfile
 ###
 
-INSTALL=""
-
 BUILD_DEPS=""
 
+INSTALL=""
+
 echo "###"
-echo "# Will install"
+echo "# Will install build tool"
 echo "###"
 echo ""
-echo $INSTALL
+echo $BUILD_DEPS
 echo ""
 echo "###"
-echo "# Will install build tool"
+echo "# Will install"
 echo "###"
 echo ""
-echo $BUILD_DEPS
+echo $INSTALL
 echo ""
 
 apk add --virtual .build-deps $BUILD_DEPS && apk add $INSTALL

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

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

package/package.json

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