File tree 5 files changed +35
-18
lines changed
5 files changed +35
-18
lines changed Original file line number Diff line number Diff line change 1
1
build_root_image :
2
2
name : release
3
3
namespace : openshift
4
- tag : rhel-8-golang-1.21 -openshift-4.16
4
+ tag : rhel-8-golang-1.22 -openshift-4.16
Original file line number Diff line number Diff line change 29
29
value : 5d
30
30
- name : dockerfile
31
31
value : Dockerfile
32
+ - name : build-source-image
33
+ value : " true"
34
+ - name : hermetic
35
+ value : " true"
36
+ - name : build-platforms
37
+ value :
38
+ - linux/x86_64
39
+ - linux/arm64
40
+ - linux/ppc64le
41
+ - linux/s390x
42
+ - name : prefetch-input
43
+ value : ' {"packages": [{"type": "gomod"}]}'
32
44
pipelineSpec :
33
45
description : |
34
46
This pipeline is ideal for building multi-arch container images from a Containerfile while maintaining trust after pipeline customization.
82
94
description : Execute the build with network isolation
83
95
name : hermetic
84
96
type : string
85
- - default : ' {"packages": [{"type": "gomod"}], "flags": ["gomod-vendor-check"]} '
97
+ - default : " "
86
98
description : Build dependencies to be prefetched by Cachi2
87
99
name : prefetch-input
88
100
type : string
@@ -108,9 +120,6 @@ spec:
108
120
type : string
109
121
- default :
110
122
- linux/x86_64
111
- - linux/arm64
112
- - linux/ppc64le
113
- - linux/s390x
114
123
description : List of platforms to build the container images on. The available
115
124
set of values is determined by the configuration of the multi-platform-controller.
116
125
name : build-platforms
Original file line number Diff line number Diff line change 26
26
value : quay.io/redhat-user-workloads/ocp-tools-s2i-tenant/source-to-image:{{revision}}
27
27
- name : dockerfile
28
28
value : Dockerfile
29
+ - name : build-source-image
30
+ value : " true"
31
+ - name : hermetic
32
+ value : " true"
33
+ - name : build-platforms
34
+ value :
35
+ - linux/x86_64
36
+ - linux/arm64
37
+ - linux/ppc64le
38
+ - linux/s390x
39
+ - name : prefetch-input
40
+ value : ' {"packages": [{"type": "gomod"}]}'
29
41
pipelineSpec :
30
42
description : |
31
43
This pipeline is ideal for building multi-arch container images from a Containerfile while maintaining trust after pipeline customization.
79
91
description : Execute the build with network isolation
80
92
name : hermetic
81
93
type : string
82
- - default : ' {"packages": [{"type": "gomod"}], "flags": ["gomod-vendor-check"]} '
94
+ - default : " "
83
95
description : Build dependencies to be prefetched by Cachi2
84
96
name : prefetch-input
85
97
type : string
@@ -105,9 +117,6 @@ spec:
105
117
type : string
106
118
- default :
107
119
- linux/x86_64
108
- - linux/arm64
109
- - linux/ppc64le
110
- - linux/s390x
111
120
description : List of platforms to build the container images on. The available
112
121
set of values is determined by the configuration of the multi-platform-controller.
113
122
name : build-platforms
Original file line number Diff line number Diff line change 1
- FROM registry.redhat.io /ubi8/go-toolset:1.22.7-5 AS builder
1
+ FROM registry.access. redhat.com /ubi8/go-toolset@sha256:be796155c0908cd48375bf1f7150036bcd3ad415dfb6cae135f1cf184d61964c AS builder
2
2
3
3
ENV S2I_GIT_VERSION="1.5.0" \
4
4
S2I_GIT_MAJOR="1" \
5
5
S2I_GIT_MINOR="5"
6
6
7
+ ENV GOEXPERIMENT=strictfipsruntime
8
+
7
9
COPY . .
8
10
9
- RUN CGO_ENABLED=0 GO111MODULE=on go build -a -mod=vendor -ldflags="-s -w" -o /tmp/s2i ./cmd/s2i
11
+ RUN CGO_ENABLED=1 GO111MODULE=on go build -a -mod=vendor -ldflags="-s -w" -tags= "strictfipsruntime exclude_graphdriver_btrfs " -o /tmp/s2i ./cmd/s2i
10
12
11
- #
12
- # Runner Image
13
- #
14
13
15
- FROM registry.redhat.io /ubi8/ubi-minimal:8.10-1130
14
+ FROM registry.access. redhat.com /ubi8@sha256:37cdac4ec130a64050d6df4e1f2ef3f53868bea55d11f623d141f139ee342bd8
16
15
17
16
COPY --from=builder /tmp/s2i /usr/local/bin/s2i
18
17
@@ -24,12 +23,12 @@ LABEL \
24
23
name="source-to-image/source-to-image" \
25
24
description="Source-to-Image is a builder image" \
26
25
summary="Source-to-Image is a builder image" \
27
- version="1.4.1 " \
26
+ version="1.5.0 " \
28
27
vendor="Red Hat, Inc." \
29
28
com.redhat.component="source-to-image-container" \
30
29
31
30
io.k8s.description="Source-to-Image is a builder image" \
32
31
io.k8s.display-name="Source-to-Image" \
33
32
io.openshift.tags="source-to-image,s2i" \
34
33
io.openshift.maintainer.product="OpenShift Container Platform" \
35
- io.openshift.maintainer.component="Source-to-Image" \
34
+ io.openshift.maintainer.component="Source-to-Image"
Original file line number Diff line number Diff line change 1
1
module github.com/openshift/source-to-image
2
2
3
- go 1.21 .0
3
+ go 1.22 .0
4
4
5
5
require (
6
6
github.com/containers/image/v5 v5.31.1
You can’t perform that action at this time.
0 commit comments