sle2docker 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba695a590e56095cca42897195533744bdc29bf3
-  data.tar.gz: 0a00b46f07ffc4dcdf85dd4c2dbed07ed8e9f1f2
+  metadata.gz: 3f15d09b5ede994585073034cba25c4c68c271aa
+  data.tar.gz: 7a7d3c1fcdae3a14470dc0338b7d108733ea31c0
 SHA512:
-  metadata.gz: 731ddcbf5d026a5e1b0c6a79147efcb6dd1004162806e334961304b75ae32bdc0b04ce81d8af8d04d6dd946ad17db5018ec73dcce7cca522f910d6aff8ef5d10
-  data.tar.gz: 4a3f8c444c6410c00f93ab89a4ba3cf5e47b678e8f2d6850d9914bc3df674e3cde3947f68ab11b166cca45354c4fc22e8e407cdadd47707f968541c949da5871
+  metadata.gz: b5fd6e752a653025541797f876a0cf9e807998fa52c78704cfd9373801717c16f0f58074b2e2e6026035716bc72df3205b643c9e19767a4d5751fd2be97281ec
+  data.tar.gz: 0ce0c1b71744653b85cb1f483493820d7da2e843c51e8e8a719661bd6642514393ec7792a86d78528143485f5d1bfaa17004bea1000921fcb3e73370daeb6a56

data/Changelog

@@ -1,3 +1,9 @@
+Mon Dec 01 17:38:53 CET 2014  Flavio Castelli <fcastelli@suse.com>
+
+	* Version 0.2.4:
+		- Make possible to include the build time repositories into the final
+			image.
+
 Wed Nov 12 15:46:38 CET 2014  Flavio Castelli <flavio@castelli.name>
 
 	* Version 0.2.3:

data/README.md

@@ -21,7 +21,7 @@ have the rights to interact with it.
 The recommended way to install sle2docker is via zypper:
 
 ```
-sudo zypper in rubygem-sle2docker
+sudo zypper in sle2docker
 ```
 
 However sle2docker can be installed via gem:
@@ -65,7 +65,7 @@ To build a template just use the following command:
 sle2docker build TEMPLATE
 ```
 
-A list of the available templates can be obtained by running:
+A list of the available templates may be obtained by running:
 
 ```
 sle2docker list
@@ -92,11 +92,11 @@ sle2docker build -u USERNAME -p PASSWORD TEMPLATE_NAME
 
 ## Subscription Management Tool integration
 
-It is possible to download all the reuiqred packages from a local 
+It is possible to download all the required packages from a local 
 Subscription Management Tool (SMT) instance:
 
 ```
-sle2docker build -s SMT_SERVER_HOSTNAME TEMPLATE
+sle2docker build -s SMT_SERVER_HOSTNAME/repo TEMPLATE
 ```
 
 By default sle2docker assumes the contents of the SMT server are served over
@@ -104,7 +104,14 @@ HTTPS. To force the retrieval of the package over plain HTTP use the
 following command:
 
 ```
-sle2docker build -s SMT_SERVER_HOSTNAME --disable-https TEMPLATE
+sle2docker build -s SMT_SERVER_HOSTNAME/repo --disable-https TEMPLATE
+```
+
+Example: Say the FQDN of your SMT is mysmt.company.com and you want to build a SLE12 Docker image.
+The corresponding call to sle2docker would look like this:
+
+```
+sle2docker build -s mysmt.company.com/repo --disable-https SLE12
 ```
 
 By default sle2docker expects the SMT instance to not require any form of

data/lib/sle2docker/builder.rb

@@ -103,6 +103,8 @@ module Sle2Docker
 
       enable_https = !@options[:disable_https]
 
+      include_build_repos = @options[:include_build_repositories]
+
       ERB.new(File.read(template_file)).result(binding)
     end
 

data/lib/sle2docker/cli.rb

@@ -40,6 +40,10 @@ module Sle2Docker
                   :type => :boolean,
                   :default => false,
                   :desc => "Do not use HTTPS when accessing repositories"
+    method_option :include_build_repositories, :aliases => ["--include-build-repos"],
+                  :type => :boolean,
+                  :default => true,
+                  :desc => "Add the repositories used at build time to the Docker image"
     def show(template_name)
       template_dir = Template.template_dir(template_name)
       builder = Builder.new(options)
@@ -76,6 +80,10 @@ module Sle2Docker
     method_option :http_proxy, :aliases => ["--http-proxy"],
                   :default => ENV['http_proxy'],
                   :desc => "HTTP proxy to use (eg: http://squid.local:3128)"
+    method_option :include_build_repositories, :aliases => ["--include-build-repos"],
+                  :type => :boolean,
+                  :default => true,
+                  :desc => "Add the repositories used at build time to the Docker image"
     def build(template_name)
       template_dir = Template.template_dir(template_name)
       builder = Builder.new(options)

data/lib/sle2docker/version.rb

@@ -1,5 +1,5 @@
 module Sle2Docker
 
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 
 end

data/lib/templates/SLE11SP2/config.xml.erb

@@ -25,16 +25,16 @@
   <users group="root">
     <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/>
   </users>
-  <repository type="rpm-md" imageinclude="true" alias="SLES11:SP2:Updates" <%= credentials %>>
+  <repository type="rpm-md" alias="SLES11:SP2:Updates" <%= 'imageinclude="true"' if include_build_repos %> <%= credentials %>>
     <source path="http<%= "s" if enable_https %>://<%= host %>/repo/$RCE/SLES11-SP2-Updates/sle-11-x86_64<%= "?credentials=NCCcredentials" if use_ncc %>"/>
   </repository>
-  <repository type="rpm-md" imageinclude="true" alias="SLES11:SP2:Core" <%= credentials %>>
+  <repository type="rpm-md" alias="SLES11:SP2:Core" <%= 'imageinclude="true"' if include_build_repos %> <%= credentials %>>
     <source path="http<%= "s" if enable_https %>://<%= host %>/repo/$RCE/SLES11-SP2-Core/sle-11-x86_64<%= "?credentials=NCCcredentials" if use_ncc %>"/>
   </repository>
-  <repository type="rpm-md" imageinclude="true" alias="SLES11:SP1:Updates" <%= credentials %>>
+  <repository type="rpm-md" alias="SLES11:SP1:Updates" <%= 'imageinclude="true"' if include_build_repos %> <%= credentials %>>
     <source path="http<%= "s" if enable_https %>://<%= host %>/repo/$RCE/SLES11-SP1-Updates/sle-11-x86_64<%= "?credentials=NCCcredentials" if use_ncc %>"/>
   </repository>
-  <repository type="rpm-md" imageinclude="true" alias="SLES11:SP1:Pool" <%= credentials %>>
+  <repository type="rpm-md" alias="SLES11:SP1:Pool" <%= 'imageinclude="true"' if include_build_repos %> <%= credentials %>>
     <source path="http<%= "s" if enable_https %>://<%= host %>/repo/$RCE/SLES11-SP1-Pool/sle-11-x86_64<%= "?credentials=NCCcredentials" if use_ncc %>"/>
   </repository>
   <packages type="image">

data/lib/templates/SLE11SP3/config.xml.erb

@@ -25,10 +25,10 @@
   <users group="root">
     <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/>
   </users>
-  <repository type="rpm-md" imageinclude="true" alias="SLES11:SP3:Updates" <%= credentials %>>
+  <repository type="rpm-md" alias="SLES11:SP3:Updates" <%= 'imageinclude="true"' if include_build_repos %> <%= credentials %>>
     <source path="http<%= "s" if enable_https %>://<%= host %>/repo/$RCE/SLES11-SP3-Updates/sle-11-x86_64<%= "?credentials=NCCcredentials" if use_ncc %>"/>
   </repository>
-  <repository type="rpm-md" imageinclude="true" alias="SLES11:SP3:Pool" <%= credentials %>>
+  <repository type="rpm-md" alias="SLES11:SP3:Pool" <%= 'imageinclude="true"' if include_build_repos %> <%= credentials %>>
     <source path="http<%= "s" if enable_https %>://<%= host %>/repo/$RCE/SLES11-SP3-Pool/sle-11-x86_64<%= "?credentials=NCCcredentials" if use_ncc %>"/>
   </repository>
   <packages type="image">

data/lib/templates/SLE12/config.xml.erb

@@ -25,10 +25,10 @@
   <users group="root">
     <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/>
   </users>
-  <repository type="rpm-md" alias="SLE12:Pool" >
+  <repository type="rpm-md" alias="SLE12:Pool" <%= 'imageinclude="true"' if include_build_repos %> <%= credentials %>>
     <source path="http<%= "s" if enable_https %>://<%= host %>/SUSE/Products/SLE-SERVER/12/x86_64/product<%= "?credentials=NCCcredentials" if use_ncc %>"/>
   </repository>
-  <repository type="rpm-md" alias="SLE12:Updates" >
+  <repository type="rpm-md" alias="SLE12:Updates" <%= 'imageinclude="true"' if include_build_repos %> <%= credentials %>>
     <source path="http<%= "s" if enable_https %>://<%= host %>/SUSE/Updates/SLE-SERVER/12/x86_64/update<%= "?credentials=NCCcredentials" if use_ncc %>"/>
   </repository>
   <packages type="image">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sle2docker
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Flavio Castelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor