docker-gem-store 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d02a17a0c6b7ba19493c1780ef2f99f918ee650d6c09b55225fc614616b8e46
-  data.tar.gz: 3c0bb21b8feddc97dac0749239ac5c7b2be1cffe95286bc6c84fcbebf7daa8e5
+  metadata.gz: 1df617bfcc53b218dfa276eed905f28d791b108e0510569fe7656c0967fcc0dc
+  data.tar.gz: 12534149e5808c67a5c80f81273a258ea62a0223a42ccd77f5c7a277ef7abda9
 SHA512:
-  metadata.gz: cba1513da98aa25cd0ae95d636f3f717626d4f8d7db0e3ab448ab1bebb2f3e7a89967bef7835759f097e300c04c1f736b2c7d7f735ad7d0edf054d9ff0692842
-  data.tar.gz: '04849ed853c127d5e4ea978095b8a20585ba05582da18e431039c7dda6d30088f392c7b8414dfdd0807e93ce1905fa387956164d3a474dae0b10f7aee7d394e6'
+  metadata.gz: 837dbb82c0b9d5214733f491af4a010c40885d0f15546d6607b16872f36f3c05a81b35bd50ab572f5e941480a74215235ed653becb30969fb4594e01da1ab9b8
+  data.tar.gz: 934f2b91b14c73d15f01ad35863ba2e9aeb4fe9d91352f19d80387d2fc5ae9136ad6a650368087dadbc205f8a91dd049e2a5e806023352e2debef07be3a14db5

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/*

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    docker-gem-store (0.2.0)
+    docker-gem-store (0.2.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -27,13 +27,13 @@ DockerfileやGemfileに更新内容を記述した後、下記コマンドでDoc
 ```
 gem-store --build
 ```
-ビルドしたイメージにタグを付けます
+docker hubへpush
 ```
-gem-store --tagging
+docker push hogehoge/hugahuga:v1
 ```
-タグを付けた後、お好みでdockerhubにpushします。
+本番環境用にソースコードとgem storeを固めたイメージを作成し、docker-compose.production.ymlを生成(または更新)
 ```
-docker push hogehoge/hugahuga:v1
+gem-store --release
 ```
 
 ## License

data/lib/docker/gem/store/version.rb

@@ -1,7 +1,7 @@
 module Docker
   module Gem
     module Store
-      VERSION = "0.2.0"
+      VERSION = "0.2.1"
     end
   end
 end

data/lib/docker/gem/store.rb

@@ -64,7 +64,7 @@ RUN bundle install
         dockerfile_path = Dir.glob("#{Dir.pwd}/dockerfiles/Dockerfile.bundle.*")
         raise "No Dockerfile found" unless File.exists?(DOCKERFILE_PATH)
 
-        config = read_config
+        config = get_config
         stdout, stderr, _ = Open3.capture3("docker build -t #{config['image']} -f #{DOCKERFILE_PATH} #{Dir.pwd}")
         puts stdout
         puts stderr if stderr
@@ -72,9 +72,33 @@ RUN bundle install
         # Gemfile.lockのコピー
         stdout, stderr, _ = Open3.capture3("docker run --rm #{config['image']} cat /gems/Gemfile.lock > #{Dir.pwd}/Gemfile.lock")
         puts stderr if stderr
-        tagging('development')
+
+        tag = tagging('development')
+
+        create_or_update_docker_compose_file('development')
+      end
+
+      def self.push
+        image_name =        get_dependent_image_name('development')
+        stdout,stderr,_ = Open3.capture3("docker push #{image_name}")
+        puts stdout
+        puts stderr if stderr
+      end
+
+      def self.show_usage
+        usage = <<-EOS
+Usage: gem-store [options]
+  options:
+    --init    gem-storeの使用を開始する
+    --update  Dockerfile.bundleの作成、または更新
+    --build   イメージのビルドを行い、タグをつける
+    --push    docker-hubにプッシュする
+    --help    Usageを表示する
+        EOS
+        puts usage
       end
 
+
       def self.release
         private_class_method :release
         if File.exists?(PRODUCTION_DOCKER_COMPOSE_FILE_PATH)
@@ -85,27 +109,33 @@ RUN bundle install
         create_tmp_dockerfile(Dir.pwd,from_image)
 
         puts 'イメージのビルド中'
-        config = read_config
+        config = get_config
         stdout,stderr,_ = Open3.capture3("docker build -t #{config['image']} -f #{TMP_DOCKERFILE_PATH}/ .")
         puts stdout
         puts stderr if stderr
 
         tagging('production')
 
-        create_or_update_production_docker_compose_file
+        create_or_update_docker_compose_file('production')
       end
 
-      def self.create_or_update_production_docker_compose_file
-        image_name = get_dependent_image_name('production')
-        if File.exists?(PRODUCTION_DOCKER_COMPOSE_FILE_PATH)
-          content = YAML.load_file(PRODUCTION_DOCKER_COMPOSE_FILE_PATH)
+      def self.create_or_update_docker_compose_file(env)
+        docker_compose_file_path = case env
+                                   when 'development'
+                                     DEVELOPMENT_DOCKER_COMPOSE_FILE_PATH
+                                   when 'production'
+                                     PRODUCTION_DOCKER_COMPOSE_FILE_PATH
+                                   end
+        image_name = get_dependent_image_name(env)
+        if File.exists?(docker_compose_file_path)
+          content = YAML.load_file(docker_compose_file_path)
           content['services']['web']['image'] = image_name
-          File.open(PRODUCTION_DOCKER_COMPOSE_FILE_PATH,'w') do |file|
+          File.open(docker_compose_file_path,'w') do |file|
             YAML.dump(content,file)
           end
         else
           content = {'version' => '3','services' => {'web' => {'image' =>image_name,'tty' => true}}}
-          File.open(PRODUCTION_DOCKER_COMPOSE_FILE_PATH,'w') do |file|
+          File.open(docker_compose_file_path,'w') do |file|
             YAML.dump(content,file)
           end
         end
@@ -129,11 +159,12 @@ COPY . /app
       def self.tagging(env)
         private_class_method :tagging
         now = Time.now.strftime("%Y%m%d%H%M%S")
-        config = read_config
+        config = get_config
         tag = "#{config['user']}/#{config['repository']}:#{now}"
         save_dockertag("#{env}",tag)
         `docker tag #{config['image']} #{tag}`
         puts tag
+        tag
       end
 
       def self.save_dockertag(env,tag)
@@ -154,8 +185,8 @@ COPY . /app
         end
       end
 
-      def self.read_config
-        private_class_method :read_config
+      def self.get_config
+        private_class_method :get_config
         YAML.load_file(CONFIG_FILE_PATH)
       end
 
@@ -169,8 +200,7 @@ COPY . /app
       end
 
       def self.run(argv)
-        params = argv.getopts("","init","update","build","tagging", "release")
-        puts params
+        params = argv.getopts("","init","update","build","tagging","push" ,"release","help")
         if params["init"]
           self.init
         elsif params["update"]
@@ -179,9 +209,14 @@ COPY . /app
           self.build
         elsif params["tagging"]
           self.tagging
+        elsif params["push"]
+          self.push
         elsif params["release"]
           self.release
+        elsif params["help"]
+          self.show_usage
         else
+          self.show_usage
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-gem-store
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - sawasaki narumi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-13 00:00:00.000000000 Z
+date: 2018-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler