generator-reshow 0.17.49 → 0.17.50

package/generators/docker/index.js

@@ -87,6 +87,6 @@ module.exports = class extends YoGenerator {
     cp("support", null, this.payload);
     cp("bin", null, this.payload);
     cp("docker", null, this.payload);
-    cp("test", null, this.payload);
+    cp("tests", null, this.payload);
   }
 };

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

@@ -10,6 +10,6 @@ docker run --rm -v $DIR/../:/app/test \
   -v /var/run/docker.sock:/var/run/docker.sock \
   -w /app/test \
   $TERRATEST \
-  go test -v ./test
+  go test -v ./tests
 
 

package/generators/docker/templates/compile.sh

@@ -4,6 +4,7 @@ DIR="$(
   cd "$(dirname "$0")"
   pwd -P
 )"
+
 localImage=$(${DIR}/support/localImage.sh)
 remoteImage=$(${DIR}/support/remoteImage.sh)
 archiveFile=$DIR/archive.tar
@@ -18,14 +19,13 @@ tag() {
   tag=$1
   if [ -z "$tag" ]; then
     if [ -z "$VERSION" ]; then
-      tag=latest
+      tag=${remoteImage}:latest
     else
-      tag=$VERSION
+      tag=${remoteImage}:$VERSION
     fi
   fi
   echo "* <!-- Start to tag: ${tag}"
-  echo $tag
-  docker tag ${localImage} ${remoteImage}:$tag
+  docker tag ${localImage} $tag
   list
   echo "* Finish tag -->"
 }

package/generators/gitlab-docker/templates/.gitlab-ci.yml

@@ -36,7 +36,7 @@ pre-test:
   stage: test
   image: $CI_TERRATEST
   script:
-    - go test -v ./test
+    - go test -v ./tests
 
 build-docker-image:
   extends: .parallel

package/package.json

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