diff --git a/doc/xml/release.xml b/doc/xml/release.xml index 8005f4ee3..611590df2 100644 --- a/doc/xml/release.xml +++ b/doc/xml/release.xml @@ -49,6 +49,10 @@

Ignore auto-generated C code created by release 2.

+ +

Merge release 2 container build changes.

+
+

Simplified smart logic for C Library and package builds.

diff --git a/test/lib/pgBackRestTest/Common/ContainerTest.pm b/test/lib/pgBackRestTest/Common/ContainerTest.pm index dad773ca6..ffb49801f 100755 --- a/test/lib/pgBackRestTest/Common/ContainerTest.pm +++ b/test/lib/pgBackRestTest/Common/ContainerTest.pm @@ -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);