Skip to content

[build] Produce Docker target consistent with stack #75621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tylersmalley merged 2 commits into from
Aug 24, 2020
Merged

[build] Produce Docker target consistent with stack #75621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5f6439
[build] Produce Docker target consistent with stack
tylersmalley Aug 21, 2020
400c77e
Merge branch 'master' into build-rename-docker
elasticmachine Aug 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/dev/build/tasks/os_packages/docker_generator/run.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ export async function runDockerGenerator(
'kibana-docker',
build.isOss() ? `oss` : `default${ubiImageFlavor}`
);
const dockerOutputDir = config.resolveFromTarget(
`kibana${imageFlavor}${ubiImageFlavor}-${version}-docker.tar.gz`
const dockerTargetFilename = config.resolveFromTarget(
`kibana${imageFlavor}${ubiImageFlavor}-${version}-docker-image.tar.gz`
);
const scope: TemplateContext = {
artifactTarball,
Expand All @@ -69,7 +69,7 @@ export async function runDockerGenerator(
artifactsDir,
imageTag,
dockerBuildDir,
dockerOutputDir,
dockerTargetFilename,
baseOSImage,
ubiImageFlavor,
dockerBuildDate,
Expand Down
2 changes: 1 addition & 1 deletion src/dev/build/tasks/os_packages/docker_generator/template_context.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export interface TemplateContext {
artifactsDir: string;
imageTag: string;
dockerBuildDir: string;
dockerOutputDir: string;
dockerTargetFilename: string;
baseOSImage: string;
ubiImageFlavor: string;
dockerBuildDate: string;
Expand Down
4 changes: 2 additions & 2 deletions src/dev/build/tasks/os_packages/docker_generator/templates/build_docker_sh.template.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function generator({
imageTag,
imageFlavor,
version,
dockerOutputDir,
dockerTargetFilename,
baseOSImage,
ubiImageFlavor,
}: TemplateContext) {
Expand All @@ -41,7 +41,7 @@ function generator({
echo "Building: kibana${imageFlavor}${ubiImageFlavor}-docker"; \\
docker build -t ${imageTag}${imageFlavor}${ubiImageFlavor}:${version} -f Dockerfile . || exit 1;

docker save ${imageTag}${imageFlavor}${ubiImageFlavor}:${version} | gzip -c > ${dockerOutputDir}
docker save ${imageTag}${imageFlavor}${ubiImageFlavor}:${version} | gzip -c > ${dockerTargetFilename}

exit 0
`);
Expand Down