Changeset 1903 in ProjectBuilder for devel/pb-modules/etc

Timestamp:

Oct 8, 2014, 1:35:10 PM (10 years ago)

Author:

Bruno Cornec

Message:

• Add entries for osrepo for mageia/mandriva distros to allow setupve to work for these distributions without resorting to sbx2setupve
• pbkeep now managed in pb_temp_init to avoid removing the temps dir when debugging
• Add functions pb_ve_docker_get_image and pb_ve_get_type
• lots of interfaces changes to allow support of docker, including script names. May break other non docker features
• both newve and setupve work with docker now.
• manages public keys for urpmi distriutions
• Adds function pb_parallel_launchv. Now pb_launchv is single V

Location:

devel/pb-modules/etc

Files:

• pb.conf (modified) (2 diffs)
• pb.conf.pod (modified) (1 diff)

devel/pb-modules/etc/pb.conf

@@ -414 +414 @@
 # When using docker some specific conf items
 dockerregistry default = http://localhost:5000/pb
+#dockeropt default =
+# Some options to pass to the docker command such as IP conf when firewalled --bip=172.17.42.1/16
+# used in addition with shorewall with a masq file having "eth0 172.17.0.0/16"
 #dockerimage mageia-4-x86_64 = mageia-4-x86_64
 #dockertag pb = pb
@@ -701 +704 @@
 osrepo redhat-6.2 =
 osrepo rpm = ftp://ftp.project-builder.org/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/pb.repo
+osrepo mageia = ftp://ftp.project-builder.org/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/pb.addmedia
+osrepo mandriva = ftp://ftp.project-builder.org/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/pb.addmedia
 osrepo deb = ftp://ftp.project-builder.org/$pbos->{'name'}/$pbos->{'version'}/pb.sources.list
 

devel/pb-modules/etc/pb.conf.pod

@@ -111 +111 @@
  Example: delivery mondorescue = prod
 
+=item B<dockeropt>
+
+ Nature: Optional
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: List of the options to call docker with
+ Conffile: project
+ Example: dockeropt default = --bip=172.16.42.1/16
+
 =item B<dockerregistry>