Skip to content

Commit 18808bf

Browse files
authored
Merge pull request #215 from oracle/update-docker-image
Update apache docker image
2 parents fe12393 + 309b825 commit 18808bf

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

kubernetes/internal/weblogic-domain-apache-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spec:
4040
# path: %LOAD_BALANCER_VOLUME_PATH%
4141
containers:
4242
- name: %DOMAIN_UID%-apache-webtier
43-
image: 12213-apache:latest
43+
image: store/oracle/apache:12.2.1.3
4444
imagePullPolicy: Never
4545
# volumeMounts:
4646
# - name: "%DOMAIN_UID%-apache-webtier"

operator/src/test/java/oracle/kubernetes/operator/create/CreateDomainGeneratedFilesBaseTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ protected ExtensionsV1beta1Deployment getExpectedApacheDeployment() {
467467
.terminationGracePeriodSeconds(60L)
468468
.addContainersItem(newContainer()
469469
.name(getApacheName())
470-
.image("12213-apache:latest")
470+
.image("store/oracle/apache:12.2.1.3")
471471
.imagePullPolicy("Never")
472472
.addEnvItem(newEnvVar()
473473
.name("WEBLOGIC_CLUSTER")

src/integration-tests/bash/run.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,9 @@ function setup_jenkins {
525525
docker pull wlsldi-v2.docker.oraclecorp.com/store-serverjre-8:latest
526526
docker tag wlsldi-v2.docker.oraclecorp.com/store-serverjre-8:latest store/oracle/serverjre:8
527527

528+
docker pull wlsldi-v2.docker.oraclecorp.com/weblogic-webtier-apache-12.2.1.3.0:latest
529+
docker tag wlsldi-v2.docker.oraclecorp.com/weblogic-webtier-apache-12.2.1.3.0:latest store/oracle/apache:12.2.1.3
530+
528531
# create a docker image for the operator code being tested
529532
docker build -t "${IMAGE_NAME_OPERATOR}:${IMAGE_TAG_OPERATOR}" --no-cache=true .
530533

@@ -541,6 +544,9 @@ function setup_local {
541544
docker pull wlsldi-v2.docker.oraclecorp.com/store-serverjre-8:latest
542545
docker tag wlsldi-v2.docker.oraclecorp.com/store-serverjre-8:latest store/oracle/serverjre:8
543546

547+
docker pull wlsldi-v2.docker.oraclecorp.com/weblogic-webtier-apache-12.2.1.3.0:latest
548+
docker tag wlsldi-v2.docker.oraclecorp.com/weblogic-webtier-apache-12.2.1.3.0:latest store/oracle/apache:12.2.1.3
549+
544550
}
545551

546552
function create_image_pull_secret_jenkins {

0 commit comments

Comments
 (0)