Skip to content
Permalink
Browse files

Merge release 2 container build changes.

  • Loading branch information...
dwsteele committed Aug 19, 2017
1 parent 7dab459 commit 8d3436bce775845d45eaf8b55e526ad784e54e0f
Showing with 7 additions and 4 deletions.
  1. +4 −0 doc/xml/release.xml
  2. +3 −4 test/lib/pgBackRestTest/Common/ContainerTest.pm
@@ -49,6 +49,10 @@
<p>Ignore auto-generated C code created by release 2.</p>
</release-item>

<release-item>
<p>Merge release 2 container build changes.</p>
</release-item>

<release-item>
<p>Simplified smart logic for C Library and package builds.</p>
</release-item>
@@ -323,7 +323,8 @@ sub containerBuild
" yum -y install epel-release && \\\n" .
" yum -y update && \\\n" .
" yum -y install openssh-server openssh-clients wget sudo python-pip build-essential git \\\n" .
" perl perl-Digest-SHA perl-DBD-Pg perl-XML-LibXML perl-IO-Socket-SSL ";
" perl perl-Digest-SHA perl-DBD-Pg perl-XML-LibXML perl-IO-Socket-SSL \\\n" .
" gcc make perl-ExtUtils-MakeMaker perl-Test-Simple";

if ($strOS eq VM_CO6)
{
@@ -560,9 +561,7 @@ sub containerBuild
}
else
{
$strScript = sectionHeader() .
"# Install package build tools and package source\n" .
" yum install -y gcc make perl-ExtUtils-MakeMaker perl-Test-Simple\n";
$strScript = '';
}

containerWrite($oStorageDocker, $strTempPath, $strOS, 'Build', $strImageParent, $strImage, $strCopy,$strScript, $bVmForce);

0 comments on commit 8d3436b

Please sign in to comment.
You can’t perform that action at this time.