dockerfile2bash 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e862d14257ad0bcc0e3c62d885848188059fc7bc
-  data.tar.gz: 14c32b9f4300e0f88eade205b2f770f9792043b7
+  metadata.gz: 5c10341f38cbf916362d40e80de112f43b12a709
+  data.tar.gz: daf9f2c0866e96a1835b3f8252c74e3875bbc898
 SHA512:
-  metadata.gz: c36dff075fd538e1d3000a6a5da840160baf37ba8c2781394a29331a27ab7ba98282ec8ebb24e94916ecea85c73ebf5ad0a863751ca38e465571fb09be93ba94
-  data.tar.gz: 14fedadd931e4a8448e5b71e59b21c88ddc0e2bce10074f8047a7182e9d12533336e960f613e5b9dc3a885a398e5ed66add85426c4c7dc9728bb33048ddc197b
+  metadata.gz: e2946deadf412b6aaaf03d4f1d57655c3711dbbc17c625a98980b67079a4c7be6b44e9395f103bd6f6c3a53fbf27d2febc12e7deff3d775228addbcc979183ba
+  data.tar.gz: b8032f7962094bf0f9939c17deb1560bc674a45e3d3a713a3f275b4a74db8c946f12d2ec6518f9c655986a2f2b43064379dea95af40f99748994e72a867db9c6

data/README.md

@@ -40,7 +40,7 @@ df2sh /path/to/your/Dockerfile [output_bash_filename]
 
 `out.sh` will be used as output filename in current directory if the `output_bash_filename` is omitted.
 
-And here some example generated scripts: [examples](./examples).
+And here're some examples of generated scripts: [examples](./examples).
 
 ## Development
 

data/examples/ngx_mruby-install.sh

@@ -1,6 +1,6 @@
 #!/bin/bash 
 
-# The script is generated from a Dockerfile via Dockerfile2bash(v0.1.0)
+# The script is generated from a Dockerfile via Dockerfile2bash(v0.1.1)
 # By B1nj0y <idegorepl@gmail.com>
 
 # The original Dockerfile is from a base image: <ubuntu:14.04> 
@@ -21,6 +21,6 @@ apt-get -y install make
 apt-get -y install libpcre3 libpcre3-dev
 apt-get -y install libmysqlclient-dev
 cd /usr/local/src/ && git clone https://github.com/matsumotory/ngx_mruby.git
-export NGINX_CONFIG_OPT_ENV --with-http_stub_status_module --with-http_ssl_module --prefix=/usr/local/nginx --with-http_realip_module --with-http_addition_module --with-http_sub_module --with-http_gunzip_module --with-http_gzip_static_module --with-http_random_index_module --with-http_secure_link_module
-echo "export NGINX_CONFIG_OPT_ENV --with-http_stub_status_module --with-http_ssl_module --prefix=/usr/local/nginx --with-http_realip_module --with-http_addition_module --with-http_sub_module --with-http_gunzip_module --with-http_gzip_static_module --with-http_random_index_module --with-http_secure_link_module" >> ~/.bashrc
+export NGINX_CONFIG_OPT_ENV="--with-http_stub_status_module --with-http_ssl_module --prefix=/usr/local/nginx --with-http_realip_module --with-http_addition_module --with-http_sub_module --with-http_gunzip_module --with-http_gzip_static_module --with-http_random_index_module --with-http_secure_link_module"
+echo 'export NGINX_CONFIG_OPT_ENV="--with-http_stub_status_module --with-http_ssl_module --prefix=/usr/local/nginx --with-http_realip_module --with-http_addition_module --with-http_sub_module --with-http_gunzip_module --with-http_gzip_static_module --with-http_random_index_module --with-http_secure_link_module"' >> ~/.bashrc
 cd /usr/local/src/ngx_mruby && sh build.sh && make install

data/lib/dockerfile2bash.rb

@@ -1,7 +1,7 @@
 require 'json'
 
 class Dockerfile2bash
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
   attr_reader :commands
   FIELDS = %w(from user run add copy arg env expose cmd onbuild)
 
@@ -23,7 +23,7 @@ class Dockerfile2bash
       next if segments.length < 2 or !FIELDS.include?(segments[0].downcase)
 
       case segments[0].downcase!
-      when "from", "user", "run", "env", "expose", "copy", "add"
+      when "from", "user", "run", "expose", "copy", "add"
         @commands << { segments[0] => segments[1] }
       when "cmd"
         @commands << { "cmd" => (JSON.parse(segments[1]) || []).join(" ") }
@@ -32,6 +32,25 @@ class Dockerfile2bash
         if args.length == 2
           @commands << { "arg" => args }
         end
+      when "env"
+        envs = segments[1].split
+        pattern = %r/^[a-zA-Z].[a-zA-Z0-9]+?=.+$/
+        case envs.length
+        when 1
+          @commands << { "env" => segments[1] }
+        when 2
+          if envs.all? { |e| e =~ pattern }
+            @commands << { "env" => segments[1] }
+          else
+            @commands << { "env" => envs.join("=") }
+          end
+        else
+          if envs.all? { |e| e =~ pattern }
+            @commands << { "env" => segments[1] }
+          else
+            @commands << { "env" => [envs[0], "\"#{envs[1..-1].join(" ")}\""].join("=") }
+          end
+        end
       end
     end
     @commands
@@ -51,7 +70,7 @@ class Dockerfile2bash
       when "env"
         env_str = "export " << cmd["env"]
         bash << env_str << "\n"
-        bash << "echo \"#{env_str}\" >> ~/.bashrc" << "\n"
+        bash << "echo \'#{env_str}\' >> ~/.bashrc" << "\n"
       end
     end
     bash

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile2bash
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - B1nj0y