Skip to content

[build] Updates Ironbank templates #102407

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 1 commit into from
Jun 16, 2021
Merged

[build] Updates Ironbank templates #102407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/dev/build/tasks/os_packages/docker_generator/bundle_dockerfiles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 {} +
Expand Down
2 changes: 1 addition & 1 deletion ...templates/ironbank/hardening_manifest.yml → ...emplates/ironbank/hardening_manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down