Skip to content

Commit 1ccd74b

Browse files
authored
Merge pull request #1092 from oracle/container-registry-runtime
Update to pull from container-registry
2 parents 3f780b2 + 5db745c commit 1ccd74b

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

docs/domains/Domain.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
]
186186
},
187187
"image": {
188-
"description": "The WebLogic Docker image; required when domainHomeInImage is true; otherwise, defaults to store/oracle/weblogic:12.2.1.3.",
188+
"description": "The WebLogic Docker image; required when domainHomeInImage is true; otherwise, defaults to container-registry.oracle.com/middleware/weblogic:12.2.1.3.",
189189
"type": "string"
190190
},
191191
"imagePullPolicy": {

docs/domains/Domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ DomainSpec is a description of a domain.
2323
| `domainHome` | string | The folder for the WebLogic Domain. Not required. Defaults to /shared/domains/domains/domainUID if domainHomeInImage is false Defaults to /u01/oracle/user_projects/domains/ if domainHomeInImage is true |
2424
| `domainHomeInImage` | Boolean | True if this domain's home is defined in the docker image for the domain. Defaults to true. |
2525
| `domainUID` | string | Domain unique identifier. Must be unique across the Kubernetes cluster. Not required. Defaults to the value of metadata.name |
26-
| `image` | string | The WebLogic Docker image; required when domainHomeInImage is true; otherwise, defaults to store/oracle/weblogic:12.2.1.3. |
26+
| `image` | string | The WebLogic Docker image; required when domainHomeInImage is true; otherwise, defaults to container-registry.oracle.com/middleware/weblogic:12.2.1.3. |
2727
| `imagePullPolicy` | string | The image pull policy for the WebLogic Docker image. Legal values are Always, Never and IfNotPresent. Defaults to Always if image ends in :latest, IfNotPresent otherwise. |
2828
| `imagePullSecrets` | array of [Local Object Reference](k8s1.13.5.md#local-object-reference) | A list of image pull secrets for the WebLogic Docker image. |
2929
| `includeServerOutInPodLog` | Boolean | If true (the default), the server .out file will be included in the pod's stdout. |

docs/domains/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1105,7 +1105,7 @@
11051105
]
11061106
},
11071107
"image": {
1108-
"description": "The WebLogic Docker image; required when domainHomeInImage is true; otherwise, defaults to store/oracle/weblogic:12.2.1.3.",
1108+
"description": "The WebLogic Docker image; required when domainHomeInImage is true; otherwise, defaults to container-registry.oracle.com/middleware/weblogic:12.2.1.3.",
11091109
"type": "string"
11101110
},
11111111
"imagePullPolicy": {

model/src/main/java/oracle/kubernetes/operator/KubernetesConstants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
/** Kubernetes constants. */
88
public interface KubernetesConstants {
9-
String DEFAULT_IMAGE = "store/oracle/weblogic:12.2.1.3";
9+
String DEFAULT_IMAGE = "container-registry.oracle.com/middleware/weblogic:12.2.1.3";
1010
String ALWAYS_IMAGEPULLPOLICY = ImagePullPolicy.Always.name();
1111
String IFNOTPRESENT_IMAGEPULLPOLICY = ImagePullPolicy.IfNotPresent.name();
1212
String LATEST_IMAGE_SUFFIX = ":latest";

model/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainSpec.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,11 @@ public class DomainSpec extends BaseConfiguration {
102102
/**
103103
* The WebLogic Docker image.
104104
*
105-
* <p>Defaults to store/oracle/weblogic:12.2.1.3
105+
* <p>Defaults to container-registry.oracle.com/middleware/weblogic:12.2.1.3
106106
*/
107107
@Description(
108108
"The WebLogic Docker image; required when domainHomeInImage is true; "
109-
+ "otherwise, defaults to store/oracle/weblogic:12.2.1.3.")
109+
+ "otherwise, defaults to container-registry.oracle.com/middleware/weblogic:12.2.1.3.")
110110
private String image;
111111

112112
/**

model/src/test/resources/oracle/kubernetes/weblogic/domain/model/domain-sample-4.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
replicas: 2
2020

2121
# The Operator currently does not support other images
22-
image: "store/oracle/weblogic:12.2.1.3"
22+
image: "container-registry.oracle.com/middleware/weblogic:12.2.1.3"
2323
# imagePullPolicy defaults to "Always" if image version is :latest
2424
imagePullPolicy: IfNotPresent
2525
# Identify which Secret contains the credentials for pulling the image

model/src/test/resources/oracle/kubernetes/weblogic/domain/model/domain-sample.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
replicas: 2
2020

2121
# The Operator currently does not support other images
22-
image: "store/oracle/weblogic:12.2.1.3"
22+
image: "container-registry.oracle.com/middleware/weblogic:12.2.1.3"
2323
# imagePullPolicy defaults to "Always" if image version is :latest
2424
imagePullPolicy: IfNotPresent
2525
# Identify which Secret contains the credentials for pulling the image

0 commit comments

Comments
 (0)