Skip to content

Commit 91ac525

Browse files
syedrikosyedriko
committed
OLS-2321: [UI] Switch to ubi9-minimal based image. Enable rpm prefetch.
1 parent 5dc9717 commit 91ac525

6 files changed

Lines changed: 153 additions & 5 deletions

File tree

‎.tekton/lightspeed-console-pull-request.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
- name: dockerfile
3333
value: Dockerfile
3434
- name: prefetch-input
35-
value: '{"type": "npm", "path": "."}'
35+
value: '[{"type": "npm", "path": "."}, {"type": "rpm", "path": "."}]'
3636
pipelineSpec:
3737
description: |
3838
This pipeline is ideal for building multi-arch container images from a Containerfile while maintaining trust after pipeline customization.
@@ -80,7 +80,7 @@ spec:
8080
description: Execute the build with network isolation
8181
name: hermetic
8282
type: string
83-
- default: ''
83+
- default: 'true'
8484
description: Build dependencies to be prefetched by Cachi2
8585
name: prefetch-input
8686
type: string

‎.tekton/lightspeed-console-push.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
- name: dockerfile
3232
value: Dockerfile
3333
- name: prefetch-input
34-
value: '{"type": "npm", "path": "."}'
34+
value: '[{"type": "npm", "path": "."}, {"type": "rpm", "path": "."}]'
3535
pipelineSpec:
3636
description: |
3737
This pipeline is ideal for building multi-arch container images from a Containerfile while maintaining trust after pipeline customization.
@@ -79,7 +79,7 @@ spec:
7979
description: Execute the build with network isolation
8080
name: hermetic
8181
type: string
82-
- default: ''
82+
- default: 'true'
8383
description: Build dependencies to be prefetched by Cachi2
8484
name: prefetch-input
8585
type: string

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ COPY locales ./locales
1313
COPY src ./src
1414
RUN npm run build
1515

16-
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
16+
FROM registry.access.redhat.com/ubi9-minimal@sha256:c7d44146f826037f6873d99da479299b889473492d3c1ab8af86f08af04ec8a0
1717
USER 0
1818

1919
RUN microdnf install -y nginx && microdnf clean all

‎rpms.in.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
packages: [nginx]
2+
contentOrigin:
3+
repofiles: ["./ubi.repo"]
4+
arches: [x86_64, aarch64]

‎rpms.lock.yaml‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
---
2+
lockfileVersion: 1
3+
lockfileVendor: redhat
4+
arches:
5+
- arch: aarch64
6+
packages:
7+
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/appstream/os/Packages/n/nginx-1.20.1-22.el9_6.3.aarch64.rpm
8+
repoid: ubi-9-for-aarch64-appstream-rpms
9+
size: 38034
10+
checksum: sha256:acf0e009df1d2a0bf3302af6ffdeb940cc55cebd758d87444b28033b0cd07ab4
11+
name: nginx
12+
evr: 2:1.20.1-22.el9_6.3
13+
sourcerpm: nginx-1.20.1-22.el9_6.3.src.rpm
14+
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/appstream/os/Packages/n/nginx-core-1.20.1-22.el9_6.3.aarch64.rpm
15+
repoid: ubi-9-for-aarch64-appstream-rpms
16+
size: 585353
17+
checksum: sha256:92b3fe4c68952603e9151ac185faa2e98fb2e5750bfe616d379dedda5de0e44a
18+
name: nginx-core
19+
evr: 2:1.20.1-22.el9_6.3
20+
sourcerpm: nginx-1.20.1-22.el9_6.3.src.rpm
21+
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/appstream/os/Packages/n/nginx-filesystem-1.20.1-22.el9_6.3.noarch.rpm
22+
repoid: ubi-9-for-aarch64-appstream-rpms
23+
size: 10729
24+
checksum: sha256:987a844a7ddf5bc2d54c5ced49ce4eba6b3d49aeb8960e0744792935b854d831
25+
name: nginx-filesystem
26+
evr: 2:1.20.1-22.el9_6.3
27+
sourcerpm: nginx-1.20.1-22.el9_6.3.src.rpm
28+
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/appstream/os/Packages/r/redhat-logos-httpd-90.5-1.el9_6.1.noarch.rpm
29+
repoid: ubi-9-for-aarch64-appstream-rpms
30+
size: 16643
31+
checksum: sha256:a3b0e027da9390f7c047cdbd6eea0ce2de11781ec2b4e6e951d74fb15af93ff4
32+
name: redhat-logos-httpd
33+
evr: 90.5-1.el9_6.1
34+
sourcerpm: redhat-logos-90.5-1.el9_6.1.src.rpm
35+
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/os/Packages/l/logrotate-3.18.0-12.el9.aarch64.rpm
36+
repoid: ubi-9-for-aarch64-baseos-rpms
37+
size: 74117
38+
checksum: sha256:9b8142fb8bd0a89c48655a385a58357e3d78ffa9a119db4eb24cec67b6e8ded8
39+
name: logrotate
40+
evr: 3.18.0-12.el9
41+
sourcerpm: logrotate-3.18.0-12.el9.src.rpm
42+
source: []
43+
module_metadata: []
44+
- arch: x86_64
45+
packages:
46+
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/appstream/os/Packages/n/nginx-1.20.1-22.el9_6.3.x86_64.rpm
47+
repoid: ubi-9-for-x86_64-appstream-rpms
48+
size: 38094
49+
checksum: sha256:ac60f31368828d6eb017ad6a755270abd48b2c15c347903a11127ac3c186c619
50+
name: nginx
51+
evr: 2:1.20.1-22.el9_6.3
52+
sourcerpm: nginx-1.20.1-22.el9_6.3.src.rpm
53+
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/appstream/os/Packages/n/nginx-core-1.20.1-22.el9_6.3.x86_64.rpm
54+
repoid: ubi-9-for-x86_64-appstream-rpms
55+
size: 584421
56+
checksum: sha256:77c7fabc1d6366608ae0fa0392be79519c93276b30f2b905d1639ae56db89796
57+
name: nginx-core
58+
evr: 2:1.20.1-22.el9_6.3
59+
sourcerpm: nginx-1.20.1-22.el9_6.3.src.rpm
60+
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/appstream/os/Packages/n/nginx-filesystem-1.20.1-22.el9_6.3.noarch.rpm
61+
repoid: ubi-9-for-x86_64-appstream-rpms
62+
size: 10729
63+
checksum: sha256:987a844a7ddf5bc2d54c5ced49ce4eba6b3d49aeb8960e0744792935b854d831
64+
name: nginx-filesystem
65+
evr: 2:1.20.1-22.el9_6.3
66+
sourcerpm: nginx-1.20.1-22.el9_6.3.src.rpm
67+
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/appstream/os/Packages/r/redhat-logos-httpd-90.5-1.el9_6.1.noarch.rpm
68+
repoid: ubi-9-for-x86_64-appstream-rpms
69+
size: 16643
70+
checksum: sha256:a3b0e027da9390f7c047cdbd6eea0ce2de11781ec2b4e6e951d74fb15af93ff4
71+
name: redhat-logos-httpd
72+
evr: 90.5-1.el9_6.1
73+
sourcerpm: redhat-logos-90.5-1.el9_6.1.src.rpm
74+
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/os/Packages/l/logrotate-3.18.0-12.el9.x86_64.rpm
75+
repoid: ubi-9-for-x86_64-baseos-rpms
76+
size: 76162
77+
checksum: sha256:ffa6b348d400fd25151f9a8042ed33cbf9b0dd305ee532e80c5f342e30e6fdf6
78+
name: logrotate
79+
evr: 3.18.0-12.el9
80+
sourcerpm: logrotate-3.18.0-12.el9.src.rpm
81+
source: []
82+
module_metadata: []

‎ubi.repo‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
[ubi-9-for-$basearch-baseos-rpms]
2+
name = Red Hat Universal Base Image 9 (RPMs) - BaseOS
3+
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/baseos/os
4+
enabled = 1
5+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
6+
gpgcheck = 1
7+
8+
[ubi-9-for-$basearch-baseos-debug-rpms]
9+
name = Red Hat Universal Base Image 9 (Debug RPMs) - BaseOS
10+
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/baseos/debug
11+
enabled = 0
12+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
13+
gpgcheck = 1
14+
15+
[ubi-9-for-$basearch-baseos-source-rpms]
16+
name = Red Hat Universal Base Image 9 (Source RPMs) - BaseOS
17+
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/baseos/source/SRPMS
18+
enabled = 0
19+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
20+
gpgcheck = 1
21+
22+
[ubi-9-for-$basearch-appstream-rpms]
23+
name = Red Hat Universal Base Image 9 (RPMs) - AppStream
24+
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/appstream/os
25+
enabled = 1
26+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
27+
gpgcheck = 1
28+
29+
[ubi-9-for-$basearch-appstream-debug-rpms]
30+
name = Red Hat Universal Base Image 9 (Debug RPMs) - AppStream
31+
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/appstream/debug
32+
enabled = 0
33+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
34+
gpgcheck = 1
35+
36+
[ubi-9-for-$basearch-appstream-source-rpms]
37+
name = Red Hat Universal Base Image 9 (Source RPMs) - AppStream
38+
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/appstream/source/SRPMS
39+
enabled = 0
40+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
41+
gpgcheck = 1
42+
43+
[codeready-builder-for-ubi-9-$basearch-rpms]
44+
name = Red Hat Universal Base Image 9 (RPMs) - CodeReady Builder
45+
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/codeready-builder/os
46+
enabled = 1
47+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
48+
gpgcheck = 1
49+
50+
[codeready-builder-for-ubi-9-$basearch-debug-rpms]
51+
name = Red Hat Universal Base Image 9 (Debug RPMs) - CodeReady Builder
52+
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/codeready-builder/debug
53+
enabled = 0
54+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
55+
gpgcheck = 1
56+
57+
[codeready-builder-for-ubi-9-$basearch-source-rpms]
58+
name = Red Hat Universal Base Image 9 (Source RPMs) - CodeReady Builder
59+
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/codeready-builder/source/SRPMS
60+
enabled = 0
61+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
62+
gpgcheck = 1

0 commit comments

Comments
 (0)