github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[docker] Consistent timestamps across builds (#96081)

Browse source 
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Jonathan Budzenski 2021-04-02 18:02:54 -05:00 • committed by GitHub
parent c97c51876e
commit 8ccb0d4ca3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/dev/build/tasks/os_packages/create_os_package_tasks.ts
View file

@ -49,6 +49,7 @@ export const CreateRpmPackage: Task = {
},
};
const dockerBuildDate = new Date().toISOString();
export const CreateDockerCentOS: Task = {
description: 'Creating Docker CentOS image',
@ -57,11 +58,13 @@ export const CreateDockerCentOS: Task = {
architecture: 'x64',
context: false,
image: true,
dockerBuildDate,
});
await runDockerGenerator(config, log, build, {
architecture: 'aarch64',
context: false,
image: true,
dockerBuildDate,
});
},
};
@ -76,6 +79,7 @@ export const CreateDockerUBI: Task = {
context: false,
ubi: true,
image: true,
dockerBuildDate,
});
}
},
@ -88,6 +92,7 @@ export const CreateDockerContexts: Task = {
await runDockerGenerator(config, log, build, {
context: true,
image: false,
dockerBuildDate,
});
if (!build.isOss()) {
@ -95,11 +100,13 @@ export const CreateDockerContexts: Task = {
ubi: true,
context: true,
image: false,
dockerBuildDate,
});
await runDockerGenerator(config, log, build, {
ironbank: true,
context: true,
image: false,
dockerBuildDate,
});
}
},

3
src/dev/build/tasks/os_packages/docker_generator/run.ts
View file

@ -33,6 +33,7 @@ export async function runDockerGenerator(
image: boolean;
ubi?: boolean;
ironbank?: boolean;
dockerBuildDate?: string;
}
) {
// UBI var config
@ -53,7 +54,7 @@ export async function runDockerGenerator(
const artifactPrefix = `kibana${artifactFlavor}-${version}-linux`;
const artifactTarball = `${artifactPrefix}-${artifactArchitecture}.tar.gz`;
const artifactsDir = config.resolveFromTarget('.');
const dockerBuildDate = new Date().toISOString();
const dockerBuildDate = flags.dockerBuildDate || new Date().toISOString();
// That would produce oss, default and default-ubi7
const dockerBuildDir = config.resolveFromRepo(
'build',