Skip to content

Commit

Permalink
Merge branch 'test/162593/kbn-es-serverless-ftr' of github.com:Ikuni1…
Browse files Browse the repository at this point in the history
…7/kibana into test/162593/kbn-es-serverless-ftr
  • Loading branch information
patrykkopycinski committed Aug 25, 2023
2 parents 6f700c6 + aba550d commit 48911eb
Showing 1 changed file with 5 additions and 12 deletions.
17 changes: 5 additions & 12 deletions packages/kbn-es/src/utils/docker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -418,10 +418,7 @@ export async function setupServerlessVolumes(log: ToolingLog, options: Serverles

log.indent(-4);

const baseCmd = [
'--volume',
`${basePath}:/objectstore:z`
];
const baseCmd = ['--volume', `${basePath}:/objectstore:z`];

if (ssl) {
const essResources = ESS_RESOURCES_PATHS.reduce<string[]>((acc, path) => {
Expand All @@ -432,14 +429,10 @@ export async function setupServerlessVolumes(log: ToolingLog, options: Serverles
return acc;
}, []);

return baseCmd.concat(
getESp12Volume(),
essResources,
[
'--volume',
`${ESS_SECRETS_PATH}:${ESS_CONFIG_PATH}secrets/secrets.json:z`,
]
);
return baseCmd.concat(getESp12Volume(), essResources, [
'--volume',
`${ESS_SECRETS_PATH}:${ESS_CONFIG_PATH}secrets/secrets.json:z`,
]);
}

return baseCmd;
Expand Down

0 comments on commit 48911eb

Please sign in to comment.