Skip to content

Commit 3961b97

Browse files
pdabelf5web-flow
pdabelf5
authored and
web-flow
committed
re-enable ubi image build & publish (#7246)
1 parent 1621d46 commit 3961b97

13 files changed

+140
-45
lines changed

‎.github/config/config-gcr-retag‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export TARGET_REGISTRY=gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev
2-
declare -a PLUS_TAG_POSTFIX_LIST=("" "-alpine" "-alpine-fips" "-mktpl")
3-
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-mktpl" "-alpine-fips")
4-
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-alpine-fips")
5-
declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-mktpl")
6-
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-mktpl")
2+
declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-alpine-fips" "-mktpl")
3+
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-mktpl" "-alpine-fips")
4+
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-alpine-fips")
5+
declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
6+
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
77
declare -a ADDITIONAL_TAGS=()

‎.github/config/config-plus-gcr-release‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
export TARGET_REGISTRY=gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release
2-
declare -a PLUS_TAG_POSTFIX_LIST=("" "-alpine" "-alpine-fips" "-mktpl")
3-
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-alpine-fips" "-mktpl")
4-
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-alpine-fips")
5-
declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-mktpl")
6-
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-mktpl")
2+
declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-alpine-fips" "-mktpl")
3+
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-alpine-fips" "-mktpl")
4+
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi" "-alpine-fips" "-ubi8")
5+
declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
6+
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
77
declare -a ADDITIONAL_TAGS=("latest" "${ADDITIONAL_TAG}")
88
export PUBLISH_OSS=false

‎.github/config/config-plus-nginx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
export TARGET_REGISTRY=docker-mgmt.nginx.com
22
export TARGET_NAP_WAF_DOS_IMAGE_PREFIX="nginx-ic-nap-dos/nginx-plus-ingress"
3-
declare -a PLUS_TAG_POSTFIX_LIST=("" "-alpine" "-alpine-fips")
4-
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-alpine-fips")
5-
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-alpine-fips")
6-
declare -a NAP_DOS_TAG_POSTFIX_LIST=("")
7-
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("")
3+
declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-alpine-fips")
4+
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-alpine-fips")
5+
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-alpine-fips")
6+
declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi")
7+
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi")
88
export PUBLISH_OSS=false

‎.github/data/matrix-images-nap.json‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,36 @@
1515
"waf,dos"
1616
],
1717
"include": [
18+
{
19+
"image": "ubi-8-plus-nap",
20+
"target": "goreleaser",
21+
"platforms": "linux/amd64",
22+
"nap_modules": "waf"
23+
},
24+
{
25+
"image": "ubi-8-plus-nap-v5",
26+
"target": "goreleaser",
27+
"platforms": "linux/amd64",
28+
"nap_modules": "waf"
29+
},
30+
{
31+
"image": "ubi-9-plus-nap",
32+
"target": "goreleaser",
33+
"platforms": "linux/amd64",
34+
"nap_modules": "waf"
35+
},
36+
{
37+
"image": "ubi-9-plus-nap",
38+
"target": "goreleaser",
39+
"platforms": "linux/amd64",
40+
"nap_modules": "dos"
41+
},
42+
{
43+
"image": "ubi-9-plus-nap",
44+
"target": "goreleaser",
45+
"platforms": "linux/amd64",
46+
"nap_modules": "waf,dos"
47+
},
1848
{
1949
"image": "alpine-plus-nap-fips",
2050
"target": "goreleaser",
@@ -32,6 +62,12 @@
3262
"target": "goreleaser",
3363
"platforms": "linux/amd64",
3464
"nap_modules": "waf"
65+
},
66+
{
67+
"image": "ubi-9-plus-nap-v5",
68+
"target": "goreleaser",
69+
"platforms": "linux/amd64",
70+
"nap_modules": "waf"
3571
}
3672
]
3773
}

‎.github/data/matrix-images-oss.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,11 @@
55
],
66
"platforms": [
77
"linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
8+
],
9+
"include": [
10+
{
11+
"image": "ubi",
12+
"platforms": "linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
13+
}
814
]
915
}

‎.github/data/matrix-images-plus.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
"image": "debian-plus",
1616
"platforms": "linux/arm64, linux/amd64",
1717
"target": "aws"
18+
},
19+
{
20+
"image": "ubi-9-plus",
21+
"platforms": "linux/arm64, linux/amd64",
22+
"target": "goreleaser"
1823
}
1924
]
2025
}

‎.github/data/matrix-smoke-nap.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
"images": [
33
{
44
"label": "AP_WAF 1/4",
5-
"image": "debian-plus-nap",
5+
"image": "ubi-8-plus-nap",
66
"type": "plus",
77
"nap_modules": "waf",
88
"marker": "appprotect_waf_policies_allow",
99
"platforms": "linux/amd64"
1010
},
1111
{
1212
"label": "AP_WAF 2/4",
13-
"image": "debian-plus-nap",
13+
"image": "ubi-9-plus-nap",
1414
"type": "plus",
1515
"nap_modules": "waf",
1616
"marker": "'appprotect_waf_policies and not appprotect_waf_policies_allow and not appprotect_waf_policies_vsr'",
@@ -58,7 +58,7 @@
5858
},
5959
{
6060
"label": "AP_DOS 3/3",
61-
"image": "debian-plus-nap",
61+
"image": "ubi-9-plus-nap",
6262
"type": "plus",
6363
"nap_modules": "dos",
6464
"marker": "dos_learning",

‎.github/data/matrix-smoke-oss.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
},
7373
{
7474
"label": "TS",
75-
"image": "debian",
75+
"image": "ubi",
7676
"type": "oss",
7777
"marker": "ts",
7878
"platforms": "linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"

‎.github/data/matrix-smoke-plus.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@
6565
},
6666
{
6767
"label": "policies 1/2",
68-
"image": "alpine-plus",
68+
"image": "ubi-9-plus",
6969
"type": "plus",
7070
"marker": "'policies and not policies_ac and not policies_jwt and not policies_mtls'",
7171
"platforms": "linux/arm64, linux/amd64, linux/s390x"
7272
},
7373
{
7474
"label": "policies 2/2",
75-
"image": "debian-plus",
75+
"image": "ubi-9-plus",
7676
"type": "plus",
7777
"marker": "'policies_ac or policies_jwt or policies_mtls'",
7878
"platforms": "linux/arm64, linux/amd64, linux/s390x"

‎.github/data/patch-images.json‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-ingress",
1212
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
1313
},
14+
{
15+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-ingress",
16+
"source_os": "ubi",
17+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-ingress",
18+
"platforms": "linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
19+
},
1420
{
1521
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-plus-ingress",
1622
"source_os": "debian",
@@ -35,6 +41,12 @@
3541
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-plus-ingress",
3642
"platforms": "linux/arm64, linux/amd64"
3743
},
44+
{
45+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-plus-ingress",
46+
"source_os": "ubi",
47+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-plus-ingress",
48+
"platforms": "linux/arm64, linux/amd64"
49+
},
3850
{
3951
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress",
4052
"source_os": "debian",
@@ -47,6 +59,18 @@
4759
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress",
4860
"platforms": "linux/amd64"
4961
},
62+
{
63+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress",
64+
"source_os": "ubi",
65+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress",
66+
"platforms": "linux/amd64"
67+
},
68+
{
69+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress",
70+
"source_os": "ubi8",
71+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress",
72+
"platforms": "linux/amd64"
73+
},
5074
{
5175
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress",
5276
"source_os": "alpine-fips",
@@ -59,6 +83,18 @@
5983
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap-v5/nginx-plus-ingress",
6084
"platforms": "linux/amd64"
6185
},
86+
{
87+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap-v5/nginx-plus-ingress",
88+
"source_os": "ubi",
89+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap-v5/nginx-plus-ingress",
90+
"platforms": "linux/amd64"
91+
},
92+
{
93+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap-v5/nginx-plus-ingress",
94+
"source_os": "ubi8",
95+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap-v5/nginx-plus-ingress",
96+
"platforms": "linux/amd64"
97+
},
6298
{
6399
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap-v5/nginx-plus-ingress",
64100
"source_os": "alpine-fips",
@@ -77,6 +113,12 @@
77113
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos/nginx-plus-ingress",
78114
"platforms": "linux/amd64"
79115
},
116+
{
117+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos/nginx-plus-ingress",
118+
"source_os": "ubi",
119+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos/nginx-plus-ingress",
120+
"platforms": "linux/amd64"
121+
},
80122
{
81123
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos-nap/nginx-plus-ingress",
82124
"source_os": "debian",
@@ -88,5 +130,11 @@
88130
"source_os": "mktpl",
89131
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos-nap/nginx-plus-ingress",
90132
"platforms": "linux/amd64"
133+
},
134+
{
135+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos-nap/nginx-plus-ingress",
136+
"source_os": "ubi",
137+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos-nap/nginx-plus-ingress",
138+
"platforms": "linux/amd64"
91139
}
92140
]

0 commit comments

Comments
 (0)