Skip to content

Remove WDT_ENCRYPTION_KEY from update image mustache #270

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
merged 2 commits into from
May 11, 2021
Merged

Remove WDT_ENCRYPTION_KEY from update image mustache #270

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91ec77b
Remove WDT_ENCRYPTION_KEY argument from update image mustache
jshum2479 May 6, 2021
779c171
Merge branch 'main' into fix-update-encryptionkey
ddsharpe May 11, 2021
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
3 changes: 1 addition & 2 deletions imagetool/src/main/resources/docker-files/Update_Image.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#
{{#isWdtEnabled}}
FROM {{baseImage}} as wdt_build
ARG WDT_ENCRYPTION_KEY
LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"

ENV WLSDEPLOY_PROPERTIES={{{wlsdeploy_properties}}} \
Expand Down Expand Up @@ -52,7 +51,7 @@

{{^modelOnly}}
RUN cd {{{wdt_home}}}/weblogic-deploy/bin \
&& {{#isWdtUseEncryption}}echo $WDT_ENCRYPTION_KEY | {{/isWdtUseEncryption}} ./{{wdtCommand}} \
&& {{#isWdtUseEncryption}}echo {{{wdtEncryptionKey}}} | {{/isWdtUseEncryption}} ./{{wdtCommand}} \
-oracle_home {{{oracle_home}}} \
-domain_home {{{domain_home}}} \
-domain_type {{domainType}} \
Expand Down