Skip to content

Commit

Permalink
simplify from
Browse files Browse the repository at this point in the history
  • Loading branch information
vsevel committed Aug 19, 2024
1 parent 548a609 commit 8fc751f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -1,9 +1 @@
{#if type == 'jvm' || type == 'legacy-jar'}
{#if dockerfile.jvm.from}
FROM {dockerfile.jvm.from}
{#else}
FROM registry.access.redhat.com/ubi8/openjdk-{java.version}:1.20
{/if}
{#else}
FROM {image}
{/if}
FROM {image}
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
{#let image=dockerfile.jvm.from.or(str:format("registry.access.redhat/ubi8/openjdk-%s:1.20", java.version))}
{#include Dockerfile-jar type='jvm' cmd=buildtool.cmd.package /}
{/let}
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
{#let image=dockerfile.jvm.from.or(str:format("registry.access.redhat/ubi8/openjdk-%s:1.20", java.version))}
{#include Dockerfile-jar type='legacy-jar' cmd=buildtool.cmd.package-legacy-jar /}
{/let}

0 comments on commit 8fc751f

Please sign in to comment.