[build] Updates Ironbank templates (#102407)

* Bump to Ironbank 8.4 * Updates to stay consistant with upstream repo Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
elastic · Jun 16, 2021 · 92f23a0 · 92f23a0
1 parent 27e6a12
commit 92f23a0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/dev/build/tasks/os_packages/docker_generator/bundle_dockerfiles.ts b/src/dev/build/tasks/os_packages/docker_generator/bundle_dockerfiles.ts
@@ -42,7 +42,7 @@ export async function bundleDockerFiles(config: Config, log: ToolingLog, scope:
  await copyAll(resolve(scope.dockerBuildDir), resolve(dockerFilesBuildDir), {
  select: ['LICENSE'],
  });
- const templates = ['hardening_manifest.yml', 'README.md'];
+ const templates = ['hardening_manifest.yaml', 'README.md'];
  for (const template of templates) {
  const file = readFileSync(resolve(__dirname, 'templates/ironbank', template));
  const output = Mustache.render(file.toString(), scope);

diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/Dockerfile b/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/Dockerfile
@@ -4,7 +4,7 @@
 ################################################################################
 ARG BASE_REGISTRY=registry1.dsop.io
 ARG BASE_IMAGE=redhat/ubi/ubi8
-ARG BASE_TAG=8.3
+ARG BASE_TAG=8.4
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as prep_files
 
@@ -59,7 +59,7 @@ COPY --chown=1000:0 config/kibana.yml /usr/share/kibana/config/kibana.yml
 
 # Add the launcher/wrapper script. It knows how to interpret environment
 # variables and translate them to Kibana CLI options.
-COPY --chown=1000:0 scripts/kibana-docker /usr/local/bin/
+COPY --chown=1000:0 bin/kibana-docker /usr/local/bin/
 
 # Remove the suid bit everywhere to mitigate "Stack Clash"
 RUN find / -xdev -perm -4000 -exec chmod u-s {} +

diff --git a/...templates/ironbank/hardening_manifest.yml → ...emplates/ironbank/hardening_manifest.yaml b/...templates/ironbank/hardening_manifest.yml → ...emplates/ironbank/hardening_manifest.yaml
@@ -14,7 +14,7 @@ tags:
 # Build args passed to Dockerfile ARGs
 args:
  BASE_IMAGE: 'redhat/ubi/ubi8'
- BASE_TAG: '8.3'
+ BASE_TAG: '8.4'
 
 # Docker image labels
 labels: