docker-runner 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9ba1c187306ebe03331ed95d0b46aa17d46054d
-  data.tar.gz: 4c0011e49704208b423735b85eaeedbe6451bdf5
+  metadata.gz: 3c7ab3124e1537797438f905e51456f760704041
+  data.tar.gz: 40b1d47cb3cd6679f1620a559bb4c0ff2a9c70c2
 SHA512:
-  metadata.gz: c815fb8d8d3190bc764d80410387c779532520982018f0f70b97fc5dc1c9c30e419d57f53b7c07450a8479da9145c9e1b40d8e80b8ee489bcb02be9100d5d3dd
-  data.tar.gz: 551667a63fb0aea99c70fc55f95846cb2c49a93164b802b4d6cbc384fb0cac662181c506bfa5c8742c6330db325bbb7ca2315cbcbdc5a3b0da45eeb720f91e7c
+  metadata.gz: 5aa9cfc86ba310e82c0b31bc4e2e67b52b57c5ff6e3a550e22f4d076ebeb6f2513c73fc22068d76dbf039bb44fc5c9d7c29b7701c5def473fe95370aa21af52d
+  data.tar.gz: d38970934855f43dcbdc5378e1b7d3b8713953709a85a2bfcb89b8fc92970a43c4bed6e694761d7cc2beb150c222e92cea93db254049d73dc224836976bfef2b

data/README.md

@@ -1,6 +1,6 @@
 # Docker::Runner
 
-A Rails Like Docker Runner Cli
+A Docker Runner Cli
 
 ## Installation
 
@@ -21,6 +21,7 @@ A Rails Like Docker Runner Cli
   - docker-runner login                 登录镜像远程仓库
   - docker-runner logout                退出镜像远程仓库
   - docker-runner console               开启镜像控制台
+  - docker-runner clean                 Docker环境清理
   - docker-runner update                更新镜像模板
   - docker-runner version               查看当前版本
     

data/bin/include/functions.sh

@@ -93,7 +93,7 @@ reset_global_env() {
 
 require_global_env() {
   if [ -r "$HOME/.docker-runner" ]; then
-    return 1
+    return 0
   else
     echo "**请先执行docker-runner setup, 进行环境初始化"
     exit 11
@@ -101,8 +101,8 @@ require_global_env() {
 }
 
 require_project_env() {
-  if require_global_env && [ -r ".docker-runner" ]; then
-    return 1
+  if require_global_env && [ -r "$PWD/.docker-runner" ]; then
+    return 0
   else
     echo "**当前目录不是镜像项目, 请切换至镜像项目"
     exit 12
@@ -267,22 +267,34 @@ error(){
 }
 
 valid_readme() {
-  if [ `grep -c "$VALID_STR" $README_PATH` -gt 0 ]; then
+  if [ ! -r $README_PATH ]; then
+    read -p "README.md不存在, 是否生成?    (Y/n)" is_reset_readme
+
+    if [ "$is_reset_readme" = 'n' ]; then
+      error "README.md不存在, 停止构建镜像"
+      return 1
+    else
+      reset_readme
+      return 0
+    fi
+    
+  elif [ `grep -c "$VALID_STR" $README_PATH` -gt 0 ]; then
     error $BUILD_ERR && \
     open $README_PATH &&
+    return 1
+  else
     return 0
   fi
-  return 1
 }
 
 valid_variables() {
-  local result=1
+  local result=0
   if [ ! -n "$username" ] ;then
-    error '请在.docker-runner文件中配置username' && result=0
+    error '请在.docker-runner文件中配置username' && result=1
   fi
 
   if [ ! -n "$image" ];then
-    error '请在.docker-runner文件中配置image' && result=0
+    error '请在.docker-runner文件中配置image' && result=1
   fi
 
   return $result
@@ -378,13 +390,13 @@ do_config() {
 }
 
 do_build() {
-  valid_readme ||\
-  valid_variables || build_image
+  valid_readme &&\
+  valid_variables && build_image
 }
 
 do_push() {
-  valid_readme ||\
-  valid_variables || push_image
+  valid_readme &&\
+  valid_variables && push_image
 }
 
 do_login() {

data/lib/docker/runner/version.rb

@@ -1,5 +1,5 @@
 module Docker
   module Runner
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-runner
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - "王长明"