db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-07-17 01:12:23 +02:00
Code Issues Releases Activity

VM build improvements.

Browse Source 
* Properly set user env before calling test.pl --vm-build.
* Remove squid proxy made obsolete by more efficient builds.
This commit is contained in:
David Steele
2016-06-13 11:18:06 -04:00
parent 7e45ed8366
commit cb32a8ab1f
2 changed files with 2 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/lib/pgBackRestTest/Docker/ContainerTest.pm
View File

@ -324,23 +324,8 @@ sub containerBuild
my $strImageParent = "$$oVm{$strOS}{&VM_IMAGE}";
my $strImage = "${strOS}-base";
# Install package proxy
my $strScript =
"# Use squid proxy\n";
if ($$oVm{$strOS}{&VM_OS_BASE} eq VM_OS_BASE_RHEL)
{
$strScript .=
"RUN echo 'proxy=http://172.17.0.1:3128' >> /etc/yum.conf";
}
elsif ($$oVm{$strOS}{&VM_OS_BASE} eq VM_OS_BASE_DEBIAN)
{
$strScript .=
"RUN echo 'Acquire {Retries \"0\"; HTTP {Proxy \"http://172.17.0.1:3128\";};};' > /etc/apt/apt.conf.d/vmproxy";
}
# Install base packages
$strScript .= "\n\n# Install base packages\n";
my $strScript = "# Install base packages\n";
if ($$oVm{$strOS}{&VM_OS_BASE} eq VM_OS_BASE_RHEL)
{