db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-03-03 14:52:21 +02:00
Code Issues Releases Activity

Merge release 2 container build changes.

Browse Source
This commit is contained in:
David Steele 2017-08-19 09:02:24 -04:00
parent 7dab459cac
commit 8d3436bce7
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/xml/release.xml
View File

@ -49,6 +49,10 @@
<p>Ignore auto-generated C code created by release 2.</p> <p>Ignore auto-generated C code created by release 2.</p>
</release-item> </release-item>
<release-item>
<p>Merge release 2 container build changes.</p>
</release-item>
<release-item> <release-item>
<p>Simplified smart logic for C Library and package builds.</p> <p>Simplified smart logic for C Library and package builds.</p>
</release-item> </release-item>

7
test/lib/pgBackRestTest/Common/ContainerTest.pm
View File

@ -323,7 +323,8 @@ sub containerBuild
" yum -y install epel-release && \\\n" . " yum -y install epel-release && \\\n" .
" yum -y update && \\\n" . " yum -y update && \\\n" .
" yum -y install openssh-server openssh-clients wget sudo python-pip build-essential git \\\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) if ($strOS eq VM_CO6)
{ {
@ -560,9 +561,7 @@ sub containerBuild
} }
else else
{ {
$strScript = sectionHeader() . $strScript = '';
"# Install package build tools and package source\n" .
" yum install -y gcc make perl-ExtUtils-MakeMaker perl-Test-Simple\n";
} }
containerWrite($oStorageDocker, $strTempPath, $strOS, 'Build', $strImageParent, $strImage, $strCopy,$strScript, $bVmForce); containerWrite($oStorageDocker, $strTempPath, $strOS, 'Build', $strImageParent, $strImage, $strCopy,$strScript, $bVmForce);