dockerun 0.3.1 → 0.3.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/.release_history.yml +4 -0
  3. data/Dockerfile.dockerun +2 -3
  4. data/Gemfile.lock +2 -2
  5. data/dockerun.gemspec +1 -1
  6. data/lib/dockerun/docker_image_helper.rb +5 -0
  7. data/lib/dockerun/version.rb +1 -1
  8. data/template/Dockerfile_general.erb +3 -4
  9. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: fb5bff4ec59c18e9c356489908fe150c409e2c84dcbeff1a2d6174de30a53296
4
- data.tar.gz: f9cd069b2d0e69f58c91074200c69e372eeeb014fd58da9e0cf8ef4b7e7b958e
3
+ metadata.gz: 777e1a207665d2cb3e4418a2890441779663c1fe5eb39dd49f498a4445213cff
4
+ data.tar.gz: a81b53e08e2e3e109104f05545e6f30f12bd2dc10590f6bd356180f8e4b919cd
5
5
  SHA512:
6
- metadata.gz: 53bf0d5b69d8c642ae384e76bf678090ea58b7498af224d1177c362f8a6d7b8836e799de8fc59f1dda613fc2a9faeb5b13ac47c3e371ba1efab967cac5defc67
7
- data.tar.gz: 93515d89d87a64b89f0c205144ca3f8d8b9bc1c51965a0b939194cadea284d01c1fe64717cbd4e2b1d065ab3a3e95300416500260126d3ae7bc9e5225a013bd0
6
+ metadata.gz: c55faea206d5bcddaee2c78d82aa101e15279236c749a43c43614aa840f4e48c7fdf02f0285207c84d76ce2cd53aa6b99974cffbaa2f035617f3ce7276522eb1
7
+ data.tar.gz: 0d666b21e41d00232f0af9354877419e6479b09286fb219369ae528b1fbb5b185d8ef85af5f695b9f85f5c3fca332f1347ef9b042fb1bf70e83ae9ab00cfb927
data/.release_history.yml CHANGED
@@ -48,3 +48,7 @@ dockerun:
48
48
  :timestamp: 1680591256.174102
49
49
  - :version: 0.3.0
50
50
  :timestamp: 1680596019.8479326
51
+ - :version: 0.3.1
52
+ :timestamp: 1680596515.6388657
53
+ - :version: 0.3.3
54
+ :timestamp: 1680598096.8177018
data/Dockerfile.dockerun CHANGED
@@ -22,11 +22,10 @@ USER chris
22
22
  #RUN sudo apt-get install -y curl build-essential
23
23
 
24
24
 
25
- COPY on_docker_config /home/chris/docker_init.rb
26
- #RUN chown chris:chris /home/chris/docker_init.rb
27
- RUN ruby /home/chris/docker_init.rb
28
25
 
29
26
 
27
+ COPY on_docker_config /tmp/docker_init.rb
28
+ RUN ruby /tmp/docker_init.rb
30
29
 
31
30
 
32
31
 
data/Gemfile.lock CHANGED
@@ -1,9 +1,9 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- dockerun (0.3.1)
4
+ dockerun (0.3.4)
5
5
  colorize
6
- docker-cli
6
+ docker-cli (>= 0.3.1)
7
7
  teLogger
8
8
  toolrack
9
9
  tty-command
data/dockerun.gemspec CHANGED
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
37
37
  spec.add_dependency 'tty-option' #, "> 0.2.0"
38
38
  spec.add_dependency 'colorize'
39
39
 
40
- spec.add_dependency 'docker-cli' #, ">= 0.1.2"
40
+ spec.add_dependency 'docker-cli', ">= 0.3.1"
41
41
 
42
42
  spec.add_development_dependency 'devops_assist'
43
43
 
data/lib/dockerun/docker_image_helper.rb CHANGED
@@ -165,6 +165,9 @@ module Dockerun
165
165
 
166
166
  dockerfile = load_dockerfile(Dir.getwd, dockerinit, &block)
167
167
  build_docker_image(name, dockerfile: dockerfile)
168
+
169
+ FileUtils.rm(dockerinit) if File.exist?(dockerinit)
170
+
168
171
  end
169
172
 
170
173
  else
@@ -175,6 +178,8 @@ module Dockerun
175
178
 
176
179
  dockerfile = load_dockerfile(Dir.getwd, dockerinit, &block)
177
180
  build_docker_image(name, dockerfile: dockerfile)
181
+
182
+ FileUtils.rm(dockerinit) if File.exist?(dockerinit)
178
183
  end
179
184
 
180
185
  end
data/lib/dockerun/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Dockerun
4
- VERSION = "0.3.1"
4
+ VERSION = "0.3.4"
5
5
  end
data/template/Dockerfile_general.erb CHANGED
@@ -24,12 +24,11 @@ USER <%= @user_login %>
24
24
  # from this point onwards, sudo is required for privileaged operation
25
25
  #RUN sudo apt-get install -y curl build-essential
26
26
 
27
- <% if not (@docker_init_file_path.nil? or @docker_init_file_path.empty?) %>
28
- COPY <%= File.basename(@docker_init_file_path) %> /home/<%= @user_login %>/docker_init.rb
29
- #RUN chown <%= @user_login %>:<%= @user_group_name %> /home/<%= @user_login %>/docker_init.rb
30
- RUN ruby /home/<%= @user_login %>/docker_init.rb
31
27
  <% end %>
32
28
 
29
+ <% if not (@docker_init_file_path.nil? or @docker_init_file_path.empty?) %>
30
+ COPY <%= File.basename(@docker_init_file_path) %> /tmp/docker_init.rb
31
+ RUN ruby /tmp/docker_init.rb
33
32
  <% end %>
34
33
 
35
34
  <% if not_empty?(@working_dir) %>
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dockerun
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.1
4
+ version: 0.3.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ian
@@ -86,14 +86,14 @@ dependencies:
86
86
  requirements:
87
87
  - - ">="
88
88
  - !ruby/object:Gem::Version
89
- version: '0'
89
+ version: 0.3.1
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - ">="
95
95
  - !ruby/object:Gem::Version
96
- version: '0'
96
+ version: 0.3.1
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: devops_assist
99
99
  requirement: !ruby/object:Gem::Requirement