Skip to content

Added 14.1.2.0.0 images and removed linux 7.6 references for SingleNode and Admin offer #353

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 5 commits into from
Jul 16, 2025
Merged

Added 14.1.2.0.0 images and removed linux 7.6 references for SingleNode and Admin offer #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bfa8122
Added pids for 14.1.2.0.0 base vm images
sanjaymantoor Jun 11, 2025
9562dc9
Added 14.1.2.0.0 images list and removed linux 7.6 references
sanjaymantoor Jun 11, 2025
3121f17
Added 14.1.2.0.0 images and removed linux 7.6 references for admin offer
sanjaymantoor Jun 11, 2025
02f67dc
Updated JSON format for admin offer UiDefinition
sanjaymantoor Jun 11, 2025
2e4d8e2
Updating virtualNetworkResourceGroupName based on virtualNetwork new …
sanjaymantoor Jul 2, 2025
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
4 changes: 4 additions & 0 deletions resources/microsoft-pid.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@ from.owls-141100-jdk8-ol87=5d011fae-34c1-4004-bd19-c2d2bccd30a4
from.owls-141100-jdk8-ol91=9d76fbe1-3bbc-4a2b-a209-7427ad1db4ab
from.owls-141100-jdk11-ol87=459c178d-aec6-4bb5-8e80-66291f0ee6a8
from.owls-141100-jdk11-ol91=5ce9afe5-c458-41b6-9b46-4899cde11806
from.owls-141200-jdk21-ol94=ce0ed319-7470-4b49-ba87-a3ebcf49b303
from.owls-141200-jdk21-ol810=2d0a20a6-3022-4142-8f46-6f84af1adc66
from.owls-141200-jdk17-ol94=d3acf02b-e8f3-41ca-9e62-1318ab0c023b
from.owls-141200-jdk17-ol810=00d54634-1327-46bc-8a05-865aa648733d


# Pids to indicate which latest base image was chosen. No difference in these
Expand Down
5 changes: 5 additions & 0 deletions resources/pid.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,11 @@ from.owls-141100-jdk8-ol87=d58854b4-a612-4fbf-b095-f2d2178a88df
from.owls-141100-jdk8-ol91=76d4dbe8-0679-4772-ad2e-461fac83dfd7
from.owls-141100-jdk11-ol87=c8f1b07d-1660-4f6a-be97-3925645e8817
from.owls-141100-jdk11-ol91=cd48f178-52a3-415e-88bb-caa45f615b94
from.owls-141200-jdk21-ol94=6acfc3a0-6225-465f-9fa9-4d63ea81405b
from.owls-141200-jdk21-ol810=69146c30-9c7e-4ce2-8642-eb8eb1b23cc5
from.owls-141200-jdk17-ol94=a9a1c9b7-6c27-4086-b271-1ffd3c215390
from.owls-141200-jdk17-ol810=69b6b433-1679-4d37-af25-3d56987c217a


# Pids to indicate which latest base image was chosen. No difference in these
# between Oracle and Microsoft
Expand Down
52 changes: 28 additions & 24 deletions weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/createUiDefinition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,56 +15,60 @@
"name": "skuUrnVersion",
"type": "Microsoft.Common.DropDown",
"label": "Oracle WebLogic Image",
"defaultValue": "WebLogic Server 14.1.1.0.0 and JDK 11 on Oracle Linux 9.1",
"defaultValue": "WebLogic Server 14.1.2.0.0 and JDK 21 on Oracle Linux 9",
"toolTip": "Choose Oracle WebLogic image, which is provided by Oracle, with Java and WebLogic preinstalled.",
"constraints": {
"allowedValues": [
{
"label": "WebLogic Server 14.1.1.0.0 and JDK 11 on Oracle Linux 9.1",
"value": "owls-141100-jdk11-ol91;Oracle:weblogic-141100-jdk11-ol91:owls-141100-jdk11-ol91;latest"
"label": "WebLogic Server 14.1.2.0.0 and JDK 21 on Oracle Linux 9",
"value": "owls-141200-jdk21-ol94;Oracle:weblogic-141200-jdk21-ol94:owls-141200-jdk21-ol94;latest"
},
{
"label": "WebLogic Server 14.1.1.0.0 and JDK 11 on Oracle Linux 8.7",
"value": "owls-141100-jdk11-ol87;Oracle:weblogic-141100-jdk11-ol87:owls-141100-jdk11-ol87;latest"
"label": "WebLogic Server 14.1.2.0.0 and JDK 21 on Oracle Linux 8",
"value": "owls-141200-jdk21-ol810;Oracle:weblogic-141200-jdk21-ol810:owls-141200-jdk21-ol810;latest"
},
{
"label": "WebLogic Server 14.1.1.0.0 and JDK 8 on Oracle Linux 9.1",
"value": "owls-141100-jdk8-ol91;Oracle:weblogic-141100-jdk8-ol91:owls-141100-jdk8-ol91;latest"
"label": "WebLogic Server 14.1.2.0.0 and JDK 17 on Oracle Linux 9",
"value": "owls-141200-jdk17-ol94;Oracle:weblogic-141200-jdk17-ol94:owls-141200-jdk17-ol94;latest"
},
{
"label": "WebLogic Server 14.1.1.0.0 and JDK 8 on Oracle Linux 8.7",
"value": "owls-141100-jdk8-ol87;Oracle:weblogic-141100-jdk8-ol87:owls-141100-jdk8-ol87;latest"
"label": "WebLogic Server 14.1.2.0.0 and JDK 17 on Oracle Linux 8",
"value": "owls-141200-jdk17-ol810;Oracle:weblogic-141200-jdk17-ol810:owls-141200-jdk17-ol810;latest"
},
{
"label": "WebLogic Server 12.2.1.4.0 and JDK 8 on Oracle Linux 9.1",
"value": "owls-122140-jdk8-ol91;Oracle:weblogic-122140-jdk8-ol91:owls-122140-jdk8-ol91;latest"
"label": "WebLogic Server 14.1.1.0.0 and JDK 11 on Oracle Linux 9",
"value": "owls-141100-jdk11-ol91;Oracle:weblogic-141100-jdk11-ol91:owls-141100-jdk11-ol91;latest"
},
{
"label": "WebLogic Server 12.2.1.4.0 and JDK 8 on Oracle Linux 8.7",
"value": "owls-122140-jdk8-ol87;Oracle:weblogic-122140-jdk8-ol87:owls-122140-jdk8-ol87;latest"
"label": "WebLogic Server 14.1.1.0.0 and JDK 11 on Oracle Linux 8",
"value": "owls-141100-jdk11-ol87;Oracle:weblogic-141100-jdk11-ol87:owls-141100-jdk11-ol87;latest"
},
{
"label": "WebLogic Server 12.2.1.4.0 and JDK8 on Oracle Linux 7.6",
"value": "owls-122140-jdk8-ol76;Oracle:weblogic-122140-jdk8-ol76:owls-122140-jdk8-ol7;latest"
"label": "WebLogic Server 14.1.1.0.0 and JDK 8 on Oracle Linux 9",
"value": "owls-141100-jdk8-ol91;Oracle:weblogic-141100-jdk8-ol91:owls-141100-jdk8-ol91;latest"
},
{
"label": "WebLogic Server 14.1.1.0.0 and JDK8 on Oracle Linux 7.6",
"value": "owls-141100-jdk8-ol76;Oracle:weblogic-141100-jdk8-ol76:owls-141100-jdk8-ol7;latest"
"label": "WebLogic Server 14.1.1.0.0 and JDK 8 on Oracle Linux 8",
"value": "owls-141100-jdk8-ol87;Oracle:weblogic-141100-jdk8-ol87:owls-141100-jdk8-ol87;latest"
},
{
"label": "WebLogic Server 14.1.1.0.0 and JDK11 on Oracle Linux 7.6",
"value": "owls-141100-jdk11-ol76;Oracle:weblogic-141100-jdk11-ol76:owls-141100-jdk11-ol7;latest"
"label": "WebLogic Server 12.2.1.4.0 and JDK 8 on Oracle Linux 9",
"value": "owls-122140-jdk8-ol91;Oracle:weblogic-122140-jdk8-ol91:owls-122140-jdk8-ol91;latest"
},
{
"label": "WebLogic Server 12.2.1.4.0 and JDK 8 on Oracle Linux 8",
"value": "owls-122140-jdk8-ol87;Oracle:weblogic-122140-jdk8-ol87:owls-122140-jdk8-ol87;latest"
},
{
"label": "WebLogic Server 14.1.1.0.0 and JDK11 on Red Hat Enterprise Linux 8.7",
"label": "WebLogic Server 14.1.1.0.0 and JDK11 on Red Hat Enterprise Linux 8",
"value": "owls-141100-jdk11-rhel87;Oracle:weblogic-141100-jdk11-rhel87:owls-141100-jdk11-rhel87;latest"
},
{
"label": "WebLogic Server 14.1.1.0.0 and JDK8 on Red Hat Enterprise Linux 8.7",
"label": "WebLogic Server 14.1.1.0.0 and JDK8 on Red Hat Enterprise Linux 8",
"value": "owls-141100-jdk8-rhel87;Oracle:weblogic-141100-jdk8-rhel87:owls-141100-jdk8-rhel87;latest"
},
{
"label": "WebLogic Server 12.2.1.4.0 and JDK8 on Red Hat Enterprise Linux 8.7",
"label": "WebLogic Server 12.2.1.4.0 and JDK8 on Red Hat Enterprise Linux 8",
"value": "owls-122140-jdk8-rhel87;Oracle:weblogic-122140-jdk8-rhel87:owls-122140-jdk8-rhel87;latest"
}
],
Expand Down Expand Up @@ -1077,8 +1081,8 @@
"uploadedPrivateKeyAlias": "[steps('section_sslConfiguration').uploadedCustomSSLSettings.uploadedPrivateKeyAlias]",
"uploadedPrivateKeyPassPhrase": "[steps('section_sslConfiguration').uploadedCustomSSLSettings.uploadedPrivateKeyPassPhrase]",
"virtualNetworkName": "[steps('section_networkingConfiguration').virtualNetwork.name]",
"virtualNetworkResourceGroupName": "[steps('section_networkingConfiguration').virtualNetwork.resourceGroup]",
"virtualNetworkResourceGroupName": "[if(equals(steps('section_networkingConfiguration').virtualNetwork.newOrExisting, 'new'),resourceGroup().name,steps('section_networkingConfiguration').virtualNetwork.resourceGroup)]",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great catch, thanks.

"virtualNetworkNewOrExisting": "[steps('section_networkingConfiguration').virtualNetwork.newOrExisting]"
}
}
}
}
14 changes: 6 additions & 8 deletions weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,23 +249,21 @@
},
"skuUrnVersion": {
"type": "string",
"defaultValue": "owls-141100-jdk11-ol91;Oracle:weblogic-141100-jdk11-ol91:owls-141100-jdk11-ol91;latest",
"defaultValue": "owls-141200-jdk21-ol94;Oracle:weblogic-141200-jdk21-ol94:owls-141200-jdk21-ol94;latest",
"allowedValues": [
"owls-141200-jdk21-ol94;Oracle:weblogic-141200-jdk21-ol94:owls-141200-jdk21-ol94;latest",
"owls-141200-jdk21-ol810;Oracle:weblogic-141200-jdk21-ol810:owls-141200-jdk21-ol810;latest",
"owls-141200-jdk17-ol94;Oracle:weblogic-141200-jdk17-ol94:owls-141200-jdk17-ol94;latest",
"owls-141200-jdk17-ol810;Oracle:weblogic-141200-jdk17-ol810:owls-141200-jdk17-ol810;latest",
"owls-141100-jdk11-ol91;Oracle:weblogic-141100-jdk11-ol91:owls-141100-jdk11-ol91;latest",
"owls-141100-jdk11-ol87;Oracle:weblogic-141100-jdk11-ol87:owls-141100-jdk11-ol87;latest",
"owls-141100-jdk8-ol91;Oracle:weblogic-141100-jdk8-ol91:owls-141100-jdk8-ol91;latest",
"owls-141100-jdk8-ol87;Oracle:weblogic-141100-jdk8-ol87:owls-141100-jdk8-ol87;latest",
"owls-122140-jdk8-ol91;Oracle:weblogic-122140-jdk8-ol91:owls-122140-jdk8-ol91;latest",
"owls-122140-jdk8-ol87;Oracle:weblogic-122140-jdk8-ol87:owls-122140-jdk8-ol87;latest",
"owls-122140-jdk8-ol76;Oracle:weblogic-122140-jdk8-ol76:owls-122140-jdk8-ol7;latest",
"owls-141100-jdk8-ol76;Oracle:weblogic-141100-jdk8-ol76:owls-141100-jdk8-ol7;latest",
"owls-141100-jdk11-ol76;Oracle:weblogic-141100-jdk11-ol76:owls-141100-jdk11-ol7;latest",
"owls-141100-jdk11-rhel87;Oracle:weblogic-141100-jdk11-rhel87:owls-141100-jdk11-rhel87;latest",
"owls-141100-jdk8-rhel87;Oracle:weblogic-141100-jdk8-rhel87:owls-141100-jdk8-rhel87;latest",
"owls-122140-jdk8-rhel87;Oracle:weblogic-122140-jdk8-rhel87:owls-122140-jdk8-rhel87;latest",
"owls-122140-jdk8-rhel76;Oracle:weblogic-122140-jdk8-rhel76:owls-122140-jdk8-rhel76;latest",
"owls-141100-jdk8-rhel76;Oracle:weblogic-141100-jdk8-rhel76:owls-141100-jdk8-rhel76;latest",
"owls-141100-jdk11-rhel76;Oracle:weblogic-141100-jdk11-rhel76:owls-141100-jdk11-rhel76;latest"
"owls-122140-jdk8-rhel87;Oracle:weblogic-122140-jdk8-rhel87:owls-122140-jdk8-rhel87;latest"
],
"metadata": {
"description": "The Oracle Linux image with Weblogic and Java preinstalled. Semicolon separated string of Sku, URN, and Version"
Expand Down
Loading