Skip to content

Commit 53b60ea

Browse files
anpanigranpanigr
authored
Script to update OCIR image repository (#3868)
* Modify scripts to upload cpu images
1 parent 4659618 commit 53b60ea

File tree

4 files changed

+237
-73
lines changed

4 files changed

+237
-73
lines changed

‎integration-tests/src/test/resources/bash-scripts/cpu.images.properties

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Copyright (c) 2023, Oracle and/or its affiliates.
2+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
4+
# WebLogic CPU Release 14.1.1.0
5+
middleware/weblogic_cpu:14.1.1.0-generic-jdk11-ol7;weblogick8s/test-images/weblogic:14.1.1.0-generic-jdk11-ol7-cpu
6+
middleware/weblogic_cpu:14.1.1.0-generic-jdk11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-generic-jdk11-ol8-cpu
7+
8+
middleware/weblogic_cpu:14.1.1.0-generic-jdk8-ol7;weblogick8s/test-images/weblogic:14.1.1.0-generic-jdk8-ol7-cpu
9+
middleware/weblogic_cpu:14.1.1.0-generic-jdk8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-generic-jdk8-ol8-cpu
10+
11+
middleware/weblogic_cpu:14.1.1.0-slim-jdk11-ol7;weblogick8s/test-images/weblogic:14.1.1.0-slim-jdk11-ol7-cpu
12+
middleware/weblogic_cpu:14.1.1.0-slim-jdk11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-slim-jdk11-ol8-cpu
13+
14+
middleware/weblogic_cpu:14.1.1.0-slim-jdk8-ol7;weblogick8s/test-images/weblogic:14.1.1.0-slim-jdk8-ol7-cpu
15+
middleware/weblogic_cpu:14.1.1.0-slim-jdk8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-slim-jdk8-ol8-cpu
16+
17+
# WebLogic CPU Release 12.2.1.4
18+
middleware/weblogic_cpu:12.2.1.4-generic-jdk8-ol7;weblogick8s/test-images/weblogic:12.2.1.4-generic-jdk8-ol7-cpu
19+
middleware/weblogic_cpu:12.2.1.4-generic-jdk8-ol8;weblogick8s/test-images/weblogic:12.2.1.4-generic-jdk8-ol8-cpu
20+
21+
middleware/weblogic_cpu:12.2.1.4-slim-jdk8-ol7;weblogick8s/test-images/weblogic:12.2.1.4-slim-jdk8-ol7
22+
middleware/weblogic_cpu:12.2.1.4-slim-jdk8-ol8;weblogick8s/test-images/weblogic:12.2.1.4-slim-jdk8-ol8-cpu
23+
24+
# WebLogic CPU Release 12.2.1.3
25+
middleware/weblogic_cpu:12.2.1.3-generic-jdk8-ol7;weblogick8s/test-images/weblogic:12.2.1.3-generic-jdk8-ol7-cpu
26+
middleware/weblogic_cpu:12.2.1.3-generic-jdk8-ol8;weblogick8s/test-images/weblogic:12.2.1.3-generic-jdk8-ol8-cpu
27+
28+
# FMW CPU Release 12.2.1.4
29+
middleware/fmw-infrastructure_cpu:12.2.1.4-jdk8-ol7;weblogick8s/test-images/fmw-infrastructure:12.2.1.4-jdk8-ol7-cpu
30+
middleware/fmw-infrastructure_cpu:12.2.1.4-jdk8-ol8;weblogick8s/test-images/fmw-infrastructure:12.2.1.4-jdk8-ol8-cpu
31+
32+
# FMW CPU Release 12.2.1.3
33+
middleware/fmw-infrastructure_cpu:12.2.1.3-jdk8-ol7;weblogick8s/test-images/fmw-infrastructure:12.2.1.3-jdk8-ol7-cpu
34+
middleware/fmw-infrastructure_cpu:12.2.1.3-jdk8-ol8;weblogick8s/test-images/fmw-infrastructure:12.2.1.3-jdk8-ol8-cpu

‎integration-tests/src/test/resources/bash-scripts/ga.images.properties

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Copyright (c) 2023, Oracle and/or its affiliates.
2+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
4+
# WebLogic GA Release 14.1.1.0
5+
middleware/weblogic:14.1.1.0-11;weblogick8s/test-images/weblogic:14.1.1.0-11
6+
middleware/weblogic:14.1.1.0-11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-11-ol8
7+
8+
middleware/weblogic:14.1.1.0-8;weblogick8s/test-images/weblogic:14.1.1.0-8
9+
middleware/weblogic:14.1.1.0-8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-8-ol8
10+
11+
middleware/weblogic:14.1.1.0-slim-11;weblogick8s/test-images/weblogic:14.1.1.0-slim-11
12+
middleware/weblogic:14.1.1.0-slim-11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-slim-11-ol8
13+
14+
middleware/weblogic:14.1.1.0-slim-8;weblogick8s/test-images/weblogic:14.1.1.0-slim-8
15+
middleware/weblogic:14.1.1.0-slim-8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-slim-8-ol8
16+
17+
middleware/weblogic:14.1.1.0-dev-11;weblogick8s/test-images/weblogic:14.1.1.0-dev-11
18+
middleware/weblogic:14.1.1.0-dev-11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-dev-11-ol8
19+
20+
middleware/weblogic:14.1.1.0-dev-8;weblogick8s/test-images/weblogic:14.1.1.0-dev-8
21+
middleware/weblogic:14.1.1.0-dev-8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-dev-8-ol8
22+
23+
# WebLogic GA Release 12.2.1.4
24+
middleware/weblogic:12.2.1.4;weblogick8s/test-images/weblogic:12.2.1.4
25+
middleware/weblogic:12.2.1.4-ol8;weblogick8s/test-images/weblogic:12.2.1.4-ol8
26+
27+
middleware/weblogic:12.2.1.4-slim;weblogick8s/test-images/weblogic:12.2.1.4-slim
28+
middleware/weblogic:12.2.1.4-slim-ol8;weblogick8s/test-images/weblogic:12.2.1.4-slim-ol8
29+
30+
middleware/weblogic:12.2.1.4-dev;weblogick8s/test-images/weblogic:12.2.1.4-dev
31+
middleware/weblogic:12.2.1.4-dev-ol8;weblogick8s/test-images/weblogic:12.2.1.4-dev-ol8
32+
33+
# WebLogic GA Release 12.2.1.3
34+
middleware/weblogic:12.2.1.3;weblogick8s/test-images/weblogic:12.2.1.3
35+
middleware/weblogic:12.2.1.3-ol8;weblogick8s/test-images/weblogic:12.2.1.3-ol8
36+
37+
middleware/weblogic:12.2.1.3-dev;weblogick8s/test-images/weblogic:12.2.1.3-dev
38+
middleware/weblogic:12.2.1.3-dev-ol8;weblogick8s/test-images/weblogic:12.2.1.3-dev-ol8
39+
40+
# FMW GA Release 12.2.1.4
41+
middleware/fmw-infrastructure:12.2.1.4;weblogick8s/test-images/fmw-infrastructure:12.2.1.4
42+
middleware/fmw-infrastructure:12.2.1.4-ol8;weblogick8s/test-images/fmw-infrastructure:12.2.1.4-ol8
43+
44+
# FMW GA Release 12.2.1.3
45+
middleware/fmw-infrastructure:12.2.1.3;weblogick8s/test-images/fmw-infrastructure:12.2.1.3
46+
middleware/fmw-infrastructure:12.2.1.3-ol8;weblogick8s/test-images/fmw-infrastructure:12.2.1.3-ol8

‎integration-tests/src/test/resources/bash-scripts/images.properties

Lines changed: 78 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,100 @@
1-
# Absolute Source Image Location; Target Image Location w.r.t. Test reposiotory
1+
# Copyright (c) 2022,2023 Oracle and/or its affiliates.
2+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
23

3-
# WebLogic Release 14.1.1.0
4-
container-registry.oracle.com/middleware/weblogic:14.1.1.0-11;weblogick8s/test-images/weblogic:14.1.1.0-11
5-
container-registry.oracle.com/middleware/weblogic:14.1.1.0-11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-11-ol8
4+
# Format: Relative Source Image Location;Relative Target Image Location
5+
# Note:
6+
# The image location is relative with reference to SOURCE_REPO/TARGET_REPO
7+
# e.g. if SOURCE_REPO is container-registry.oracle.com
8+
# then the script expect the image to be pulled as follows ...
9+
# docker pull container-registry.oracle.com/middleware/weblogic:14.1.1.0-11
10+
# e.g. if TARGET_REPO is phx.ocir.io
11+
# then the script expect the image to be pushed as follows ...
12+
# docker push phx.ocir.io/test-images/weblogic/weblogic:14.1.1.0-11
613

7-
container-registry.oracle.com/middleware/weblogic:14.1.1.0-8;weblogick8s/test-images/weblogic:14.1.1.0-8
8-
container-registry.oracle.com/middleware/weblogic:14.1.1.0-8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-8-ol8
14+
# WebLogic GA Release 14.1.1.0
15+
middleware/weblogic:14.1.1.0-11;weblogick8s/test-images/weblogic:14.1.1.0-11
16+
middleware/weblogic:14.1.1.0-11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-11-ol8
917

10-
container-registry.oracle.com/middleware/weblogic:14.1.1.0-slim-11;weblogick8s/test-images/weblogic:14.1.1.0-slim-11
11-
container-registry.oracle.com/middleware/weblogic:14.1.1.0-slim-11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-slim-11-ol8
18+
middleware/weblogic:14.1.1.0-8;weblogick8s/test-images/weblogic:14.1.1.0-8
19+
middleware/weblogic:14.1.1.0-8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-8-ol8
1220

13-
container-registry.oracle.com/middleware/weblogic:14.1.1.0-slim-8;weblogick8s/test-images/weblogic:14.1.1.0-slim-8
14-
container-registry.oracle.com/middleware/weblogic:14.1.1.0-slim-8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-slim-8-ol8
21+
middleware/weblogic:14.1.1.0-slim-11;weblogick8s/test-images/weblogic:14.1.1.0-slim-11
22+
middleware/weblogic:14.1.1.0-slim-11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-slim-11-ol8
1523

16-
container-registry.oracle.com/middleware/weblogic:14.1.1.0-dev-11;weblogick8s/test-images/weblogic:14.1.1.0-dev-11
17-
container-registry.oracle.com/middleware/weblogic:14.1.1.0-dev-11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-dev-11-ol8
24+
middleware/weblogic:14.1.1.0-slim-8;weblogick8s/test-images/weblogic:14.1.1.0-slim-8
25+
middleware/weblogic:14.1.1.0-slim-8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-slim-8-ol8
1826

19-
container-registry.oracle.com/middleware/weblogic:14.1.1.0-dev-8;weblogick8s/test-images/weblogic:14.1.1.0-dev-8
20-
container-registry.oracle.com/middleware/weblogic:14.1.1.0-dev-8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-dev-8-ol8
27+
middleware/weblogic:14.1.1.0-dev-11;weblogick8s/test-images/weblogic:14.1.1.0-dev-11
28+
middleware/weblogic:14.1.1.0-dev-11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-dev-11-ol8
2129

22-
# WebLogic Release 12.2.1.4
30+
middleware/weblogic:14.1.1.0-dev-8;weblogick8s/test-images/weblogic:14.1.1.0-dev-8
31+
middleware/weblogic:14.1.1.0-dev-8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-dev-8-ol8
2332

24-
container-registry.oracle.com/middleware/weblogic:12.2.1.4;weblogick8s/test-images/weblogic:12.2.1.4
25-
container-registry.oracle.com/middleware/weblogic:12.2.1.4-ol8;weblogick8s/test-images/weblogic:12.2.1.4-ol8
33+
# WebLogic GA Release 12.2.1.4
34+
middleware/weblogic:12.2.1.4;weblogick8s/test-images/weblogic:12.2.1.4
35+
middleware/weblogic:12.2.1.4-ol8;weblogick8s/test-images/weblogic:12.2.1.4-ol8
2636

27-
container-registry.oracle.com/middleware/weblogic:12.2.1.4-slim;weblogick8s/test-images/weblogic:12.2.1.4-slim
28-
container-registry.oracle.com/middleware/weblogic:12.2.1.4-slim-ol8;weblogick8s/test-images/weblogic:12.2.1.4-slim-ol8
37+
middleware/weblogic:12.2.1.4-slim;weblogick8s/test-images/weblogic:12.2.1.4-slim
38+
middleware/weblogic:12.2.1.4-slim-ol8;weblogick8s/test-images/weblogic:12.2.1.4-slim-ol8
2939

30-
container-registry.oracle.com/middleware/weblogic:12.2.1.4-dev;weblogick8s/test-images/weblogic:12.2.1.4-dev
31-
container-registry.oracle.com/middleware/weblogic:12.2.1.4-dev-ol8;weblogick8s/test-images/weblogic:12.2.1.4-dev-ol8
40+
middleware/weblogic:12.2.1.4-dev;weblogick8s/test-images/weblogic:12.2.1.4-dev
41+
middleware/weblogic:12.2.1.4-dev-ol8;weblogick8s/test-images/weblogic:12.2.1.4-dev-ol8
3242

33-
# WebLogic Release 12.2.1.3
43+
# WebLogic GA Release 12.2.1.3
44+
middleware/weblogic:12.2.1.3;weblogick8s/test-images/weblogic:12.2.1.3
45+
middleware/weblogic:12.2.1.3-ol8;weblogick8s/test-images/weblogic:12.2.1.3-ol8
3446

35-
container-registry.oracle.com/middleware/weblogic:12.2.1.3;weblogick8s/test-images/weblogic:12.2.1.3
36-
container-registry.oracle.com/middleware/weblogic:12.2.1.3-ol8;weblogick8s/test-images/weblogic:12.2.1.3-ol8
47+
middleware/weblogic:12.2.1.3-dev;weblogick8s/test-images/weblogic:12.2.1.3-dev
48+
middleware/weblogic:12.2.1.3-dev-ol8;weblogick8s/test-images/weblogic:12.2.1.3-dev-ol8
3749

38-
container-registry.oracle.com/middleware/weblogic:12.2.1.3-dev;weblogick8s/test-images/weblogic:12.2.1.3-dev
39-
container-registry.oracle.com/middleware/weblogic:12.2.1.3-dev-ol8;weblogick8s/test-images/weblogic:12.2.1.3-dev-ol8
50+
# FMW GA Release 12.2.1.4
51+
middleware/fmw-infrastructure:12.2.1.4;weblogick8s/test-images/fmw-infrastructure:12.2.1.4
52+
middleware/fmw-infrastructure:12.2.1.4-ol8;weblogick8s/test-images/fmw-infrastructure:12.2.1.4-ol8
4053

41-
# FMW Release 12.2.1.4
54+
# FMW GA Release 12.2.1.3
55+
middleware/fmw-infrastructure:12.2.1.3;weblogick8s/test-images/fmw-infrastructure:12.2.1.3
56+
middleware/fmw-infrastructure:12.2.1.3-ol8;weblogick8s/test-images/fmw-infrastructure:12.2.1.3-ol8
4257

43-
container-registry.oracle.com/middleware/fmw-infrastructure:12.2.1.4;weblogick8s/test-images/fmw-infrastructure:12.2.1.4
44-
container-registry.oracle.com/middleware/fmw-infrastructure:12.2.1.4-ol8;weblogick8s/test-images/fmw-infrastructure:12.2.1.4-ol8
58+
# Oracle DB Image Release 12.2.0.1-slim
59+
database/enterprise:12.2.0.1-slim;weblogick8s/test-images/database/enterprise:12.2.0.1-slim
4560

46-
# FMW Release 12.2.1.3
47-
container-registry.oracle.com/middleware/fmw-infrastructure:12.2.1.3;weblogick8s/test-images/fmw-infrastructure:12.2.1.3
48-
container-registry.oracle.com/middleware/fmw-infrastructure:12.2.1.3-ol8;weblogick8s/test-images/fmw-infrastructure:12.2.1.3-ol8
61+
# Oracle DB Operator Image
62+
database/operator:0.2.0;weblogick8s/test-images/database/operator:0.2.0
4963

50-
# Oracle DB Image Release 12.2.0.1-slim
51-
container-registry.oracle.com/database/enterprise:12.2.0.1-slim;weblogick8s/test-images/database/enterprise:12.2.0.1-slim
64+
# Manually Update the Target Reposiotory for the following image(s)
65+
#busybox:1.34.1;weblogick8s/test-images/docker/busybox:1.34.1
66+
#elasticsearch:7.8.1;weblogick8s/test-images/docker/elasticsearch:7.8.1
67+
#k8s.gcr.io/ingress-nginx/controller:v1.2.0;weblogick8s/test-images/ingress-nginx/controller:v1.2.0
5268

53-
# BusyBox
54-
busybox:1.34.1;weblogick8s/test-images/docker/busybox:1.34.1
5569

56-
# NGINX Controller
57-
k8s.gcr.io/ingress-nginx/controller:v1.2.0;weblogick8s/test-images/ingress-nginx/controller:v1.2.0
70+
# WebLogic CPU Release 14.1.1.0
71+
middleware/weblogic_cpu:14.1.1.0-generic-jdk11-ol7;weblogick8s/test-images/weblogic:14.1.1.0-generic-jdk11-ol7-cpu
72+
middleware/weblogic_cpu:14.1.1.0-generic-jdk11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-generic-jdk11-ol8-cpu
5873

59-
# Oracle DB Operator Image
60-
container-registry.oracle.com/database/operator:0.2.0;weblogick8s/test-images/database/operator:0.2.0
74+
middleware/weblogic_cpu:14.1.1.0-generic-jdk8-ol7;weblogick8s/test-images/weblogic:14.1.1.0-generic-jdk8-ol7-cpu
75+
middleware/weblogic_cpu:14.1.1.0-generic-jdk8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-generic-jdk8-ol8-cpu
76+
77+
middleware/weblogic_cpu:14.1.1.0-slim-jdk11-ol7;weblogick8s/test-images/weblogic:14.1.1.0-slim-jdk11-ol7-cpu
78+
middleware/weblogic_cpu:14.1.1.0-slim-jdk11-ol8;weblogick8s/test-images/weblogic:14.1.1.0-slim-jdk11-ol8-cpu
79+
80+
middleware/weblogic_cpu:14.1.1.0-slim-jdk8-ol7;weblogick8s/test-images/weblogic:14.1.1.0-slim-jdk8-ol7-cpu
81+
middleware/weblogic_cpu:14.1.1.0-slim-jdk8-ol8;weblogick8s/test-images/weblogic:14.1.1.0-slim-jdk8-ol8-cpu
82+
83+
# WebLogic CPU Release 12.2.1.4
84+
middleware/weblogic_cpu:12.2.1.4-generic-jdk8-ol7;weblogick8s/test-images/weblogic:12.2.1.4-generic-jdk8-ol7-cpu
85+
middleware/weblogic_cpu:12.2.1.4-generic-jdk8-ol8;weblogick8s/test-images/weblogic:12.2.1.4-generic-jdk8-ol8-cpu
86+
87+
middleware/weblogic_cpu:12.2.1.4-slim-jdk8-ol7;weblogick8s/test-images/weblogic:12.2.1.4-slim-jdk8-ol7
88+
middleware/weblogic_cpu:12.2.1.4-slim-jdk8-ol8;weblogick8s/test-images/weblogic:12.2.1.4-slim-jdk8-ol8-cpu
89+
90+
# WebLogic CPU Release 12.2.1.3
91+
middleware/weblogic_cpu:12.2.1.3-generic-jdk8-ol7;weblogick8s/test-images/weblogic:12.2.1.3-generic-jdk8-ol7-cpu
92+
middleware/weblogic_cpu:12.2.1.3-generic-jdk8-ol8;weblogick8s/test-images/weblogic:12.2.1.3-generic-jdk8-ol8-cpu
6193

62-
# ElasticSearch Image
63-
elasticsearch:7.8.1;weblogick8s/test-images/docker/elasticsearch:7.8.1
94+
# FMW CPU Release 12.2.1.4
95+
middleware/fmw-infrastructure_cpu:12.2.1.4-jdk8-ol7;weblogick8s/test-images/fmw-infrastructure:12.2.1.4-jdk8-ol7-cpu
96+
middleware/fmw-infrastructure_cpu:12.2.1.4-jdk8-ol8;weblogick8s/test-images/fmw-infrastructure:12.2.1.4-jdk8-ol8-cpu
6497

98+
# FMW CPU Release 12.2.1.3
99+
middleware/fmw-infrastructure_cpu:12.2.1.3-jdk8-ol7;weblogick8s/test-images/fmw-infrastructure:12.2.1.3-jdk8-ol7-cpu
100+
middleware/fmw-infrastructure_cpu:12.2.1.3-jdk8-ol8;weblogick8s/test-images/fmw-infrastructure:12.2.1.3-jdk8-ol8-cpu

‎integration-tests/src/test/resources/bash-scripts/syncTestImagesRepo.sh

Lines changed: 79 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,110 @@
11
#!/bin/bash
2-
# Copyright (c) 2022, Oracle and/or its affiliates.
2+
# Copyright (c) 2022,2023 Oracle and/or its affiliates.
33
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44

55
set -eu
66
set -o pipefail
77

8-
repoLogin() {
8+
WLSIMG_BUILDER=${WLSIMG_BUILDER:-docker}
99

10-
echo "${WLSIMG_BUILDER:-docker} login to src ${SOURCE_REPO}"
10+
login() {
11+
12+
echo "${WLSIMG_BUILDER} login to src ${SOURCE_REPO}"
1113
echo ${SOURCE_PASSWORD} > pwd.txt
12-
cat pwd.txt | ${WLSIMG_BUILDER:-docker} login ${SOURCE_REPO} -u ${SOURCE_USER} --password-stdin
14+
cat pwd.txt | ${WLSIMG_BUILDER} login ${SOURCE_REPO} -u ${SOURCE_USER} --password-stdin
1315
rm -rf pwd.txt
1416

1517
# Alternatively use
16-
# ${WLSIMG_BUILDER:-docker} login ${SOURCE_REPO} -u ${SOURCE_USER} -p ${SOURCE_PASSWORD}
18+
# ${WLSIMG_BUILDER} login ${SOURCE_REPO} -u ${SOURCE_USER} -p ${SOURCE_PASSWORD}
1719

18-
echo "${WLSIMG_BUILDER:-docker} login to target ${TARGET_REPO}"
20+
echo "${WLSIMG_BUILDER} login to target ${TARGET_REPO}"
1921
echo ${TARGET_PASSWORD} > pwd.txt
20-
cat pwd.txt | ${WLSIMG_BUILDER:-docker} login ${TARGET_REPO} -u ${TARGET_USER} --password-stdin
22+
cat pwd.txt | ${WLSIMG_BUILDER} login ${TARGET_REPO} -u ${TARGET_USER} --password-stdin
2123
rm -rf pwd.txt
2224

2325
}
2426

25-
repoPullPushImage() {
27+
pullPushImage() {
2628

2729
# Here the source image contains absolute image path
2830
# and source image contains relative path wrt to TARGET_REPO
2931

30-
src_image="${1}"
32+
src_image="${SOURCE_REPO}/${1}"
3133
tgt_image="${TARGET_REPO}/${2}"
3234

33-
if [ ${DRY_RUN} == "true" ]; then
34-
echo "Executing a dry run ..."
35-
echo "${WLSIMG_BUILDER:-docker} pull ${src_image} "
36-
echo "${WLSIMG_BUILDER:-docker} tag ${src_image} ${tgt_image} "
37-
echo "${WLSIMG_BUILDER:-docker} push ${tgt_image} "
38-
else
39-
printf 'SRC[%s] TARGET[%s] \n' "${src_image}" "${tgt_image}"
40-
${WLSIMG_BUILDER:-docker} pull ${src_image}
41-
${WLSIMG_BUILDER:-docker} tag ${src_image} ${tgt_image}
42-
${WLSIMG_BUILDER:-docker} push ${tgt_image}
43-
44-
${WLSIMG_BUILDER:-docker} rmi -f ${src_image}
45-
${WLSIMG_BUILDER:-docker} rmi -f ${tgt_image}
35+
image=$(echo ${src_image} | awk -F"/" '{print $NF}')
36+
37+
#printf 'SOURCE[%s] \n' "${src_image}" >> ${OUT}
38+
#printf 'TARGET[%s] \n' "${tgt_image}" >> ${OUT}
39+
40+
${WLSIMG_BUILDER} pull ${src_image} || true
41+
sid=$(${WLSIMG_BUILDER} images ${src_image} -q)
42+
if [ "x$sid" == "x" ] ; then
43+
printf 'Could not download Source Image [%s] \n' ${src_image}
44+
exit -1
45+
fi
46+
47+
${WLSIMG_BUILDER} pull ${tgt_image} || true
48+
tid=$(${WLSIMG_BUILDER} images ${tgt_image} -q)
49+
if [ -z ${tid} ]; then
50+
printf 'Could not download Target Image [%s] \n' ${tgt_image}
51+
if [ ${DRY_RUN} != "true" ]; then
52+
${WLSIMG_BUILDER} tag ${src_image} ${tgt_image}
53+
${WLSIMG_BUILDER} push ${tgt_image}
54+
${WLSIMG_BUILDER} rmi -f ${src_image}
55+
${WLSIMG_BUILDER} rmi -f ${tgt_image}
56+
printf 'MISSING Uploaded missing [%s] to Target \n' "${image}" >> ${OUT}
57+
else
58+
printf 'MISSING [%s] image on Target Repositoty \n' "${image}" >> ${OUT}
59+
fi
4660
fi
4761

62+
# Compare the images id(s)
63+
# Update the image if needed based on id comparision
64+
if [ ! -z ${tid} ] && [ ! -z ${sid} ]; then
65+
#printf 'SOURCE_IMAGEID[%s] TARGET_IMAGEID[%s]\n' "${sid}" "${tid}" >> ${OUT}
66+
if [ ${tid} == ${sid} ]; then
67+
printf 'SKIP [%s] image is up-to-date \n' "${image}" >> ${OUT}
68+
else
69+
td=$(date "+%Y-%m-%d")
70+
printf 'UPDATE [%s] image updated \n' "${image}" >> ${OUT}
71+
if [ ${DRY_RUN} != "true" ]; then
72+
printf 'Updating image [%s] on Target \n' "${image}" >> ${OUT}
73+
${WLSIMG_BUILDER} rmi -f ${tgt_image}
74+
${WLSIMG_BUILDER} tag ${src_image} ${tgt_image}
75+
${WLSIMG_BUILDER} push ${tgt_image}
76+
${WLSIMG_BUILDER} rmi -f ${src_image}
77+
${WLSIMG_BUILDER} rmi -f ${tgt_image}
78+
else
79+
printf 'UPDATE [%s] image updated \n' "${image}" >> ${OUT}
80+
fi
81+
fi
82+
fi
83+
printf '\n' >> ${OUT}
4884
}
4985

50-
repoPullPushImages() {
51-
file="images.properties"
52-
grep -E -v '^#' $file | grep -v "^$" |
86+
pullPushImages() {
87+
grep -E -v '^#' ${1} | grep -v "^$" |
5388
while IFS=";" read -r f1 f2
5489
do
55-
# printf 'Source Location : [%s], Target: [%s] \n' "$f1" "$f2"
56-
repoPullPushImage $f1 $f2
90+
#printf 'Source Location : [%s], Target: [%s] \n' "$f1" "$f2"
91+
pullPushImage $f1 $f2
5792
done
5893
}
5994

6095
#MAIN
6196

6297
if [ $# -ge 1 ]; then
6398
echo "Export the following Environment varaiables before running the script"
64-
echo " SOURCE_REPO(ocr), SOURCE_USER, SOURCE_PASSWORD (Base Image repository)"
65-
echo " TARGET_REPO(ocir), TARGET_USER, TARGET_PASSWORD (Target Image repository)"
99+
echo " SOURCE_REPO(ocr),SOURCE_USER,SOURCE_PASSWORD (Source Image repository)"
100+
echo " TARGET_REPO(ocir),TARGET_USER,TARGET_PASSWORD(Target Image repository)"
101+
echo " PROP_FILE(images.properties) The image properties file to be loaded"
66102
exit 0
67103
fi
68104

105+
OUT=update.out
106+
echo -e "#### Image Upgrade Status on [`date`] \n" > ${OUT}
107+
69108
SOURCE_REPO=${SOURCE_REPO:-container-registry.oracle.com}
70109
SOURCE_USER=${SOURCE_USER:-oracle}
71110
SOURCE_PASSWORD=${SOURCE_PASSWORD:-changeme}
@@ -75,6 +114,14 @@ TARGET_USER=${TARGET_USER:-oracle}
75114
TARGET_PASSWORD=${TARGET_PASSWORD:-changeme}
76115

77116
DRY_RUN=${DRY_RUN:-false}
117+
PROP_FILE=${PROP_FILE:-images.properties}
118+
119+
if [ -f ${PROP_FILE} ]; then
120+
echo "Loading the Image properties file [${PROP_FILE}]"
121+
else
122+
echo "Could not load Image properties file [${PROP_FILE}]"
123+
exit -1
124+
fi
78125

79126
echo "SOURCE_REPO[$SOURCE_REPO] and TARGET_REPO[${TARGET_REPO}]"
80127

@@ -83,5 +130,6 @@ if [ ${SOURCE_REPO} == ${TARGET_REPO} ]; then
83130
exit -1
84131
fi
85132

86-
repoLogin
87-
repoPullPushImages
133+
login
134+
pullPushImages ${PROP_FILE}
135+
cat ${OUT}

0 commit comments

Comments
 (0)