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

Pre-build containers for any execute elements marked pre.

Browse Source 
This allows the documentation to be built more quickly and offline during development when --pre is specified on the command line.

Each host gets a pre-built container with all the execute elements marked pre. As long as the pre elements do not change the container will not need to be rebuilt.

The feature should not be used for CI builds as it may hide errors in the documentation.
This commit is contained in:
David Steele
2018-11-29 14:45:15 -05:00
parent 74b72df9db
commit 5d3c8e47f1
7 changed files with 95 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
doc/lib/BackRestDoc/Common/DocExecute.pm
View File

@ -259,7 +259,8 @@ sub execute
&log(DEBUG, (' ' x $iIndent) . "execute: $strCommand");
if ($self->{oManifest}->variableReplace($oCommand->paramGet('skip', false, 'n')) ne 'y')
if ($self->{oManifest}->variableReplace($oCommand->paramGet('skip', false, 'n')) ne 'y' ||
$oCommand->paramGet('pre', false, 'n') eq 'y' && $self->{oManifest}->{bPre})
{
if ($self->{bExe} && $self->isRequired($oSection))
{
@ -1037,8 +1038,51 @@ sub sectionChildProcess
executeTest("rm -rf ~/data/$$hCacheKey{name}");
executeTest("mkdir -p ~/data/$$hCacheKey{name}/etc");
my $strHost = $hCacheKey->{name};
my $strImage = $hCacheKey->{image};
# Determine if a pre-built image should be created
if (defined($self->preExecute($strHost)))
{
my $strPreImage = "${strImage}-${strHost}";
my $strFrom = $strImage;
&log(INFO, "Build vm '${strPreImage}' from '${strFrom}'");
my $strCommandList;
# Add all pre commands
foreach my $oExecute ($self->preExecute($strHost))
{
my $hExecuteKey = $self->executeKey($strHost, $oExecute);
my $strCommand =
join("\n", @{$hExecuteKey->{cmd}}) .
(defined($hExecuteKey->{'cmd-extra'}) ? ' ' . $hExecuteKey->{'cmd-extra'} : '');
if (defined($strCommandList))
{
$strCommandList .= "\n";
}
$strCommandList .= "RUN ${strCommand}";
&log(DETAIL, " Pre command $strCommand");
}
# Build container
my $strDockerfile = $self->{oManifest}{strDocPath} . "/output/doc-host.dockerfile";
$self->{oManifest}{oStorage}->put(
$strDockerfile,
"FROM ${strFrom}\n\n" . trim($self->{oManifest}->variableReplace($strCommandList)) . "\n");
executeTest("docker build -f ${strDockerfile} -t ${strPreImage} " . $self->{oManifest}{oStorage}->pathGet());
# Use the pre-built image
$strImage = $strPreImage;
}
my $oHost = new pgBackRestTest::Common::HostTest(
$$hCacheKey{name}, "doc-$$hCacheKey{name}", $$hCacheKey{image},
$$hCacheKey{name}, "doc-$$hCacheKey{name}", $strImage,
$self->{oManifest}->variableReplace($oChild->paramGet('user')), $$hCacheKey{os},
defined($oChild->paramGet('mount', false)) ?
[$self->{oManifest}->variableReplace($oChild->paramGet('mount'))] : undef,