Skip to content

Commit bc81c9a

Browse files
committed
Fix enterprise contract violations
Changes: - Required labels added - Hermetic build enabled - Source image build enabled
1 parent a076064 commit bc81c9a

File tree

10 files changed

+24
-631
lines changed

10 files changed

+24
-631
lines changed

.tekton/source-to-image-pull-request.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -77,19 +77,19 @@ spec:
7777
description: Skip checks against built image
7878
name: skip-checks
7979
type: string
80-
- default: "false"
80+
- default: "true"
8181
description: Execute the build with network isolation
8282
name: hermetic
8383
type: string
84-
- default: ""
84+
- default: '{"packages": [{"type": "gomod"}], "flags": ["gomod-vendor-check"]}'
8585
description: Build dependencies to be prefetched by Cachi2
8686
name: prefetch-input
8787
type: string
8888
- default: ""
8989
description: Image tag expiration time, time values could be something like
9090
1h, 2d, 3w for hours, days, and weeks, respectively.
9191
name: image-expires-after
92-
- default: "false"
92+
- default: "true"
9393
description: Build a source image.
9494
name: build-source-image
9595
type: string

.tekton/source-to-image-push.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,19 @@ spec:
7474
description: Skip checks against built image
7575
name: skip-checks
7676
type: string
77-
- default: "false"
77+
- default: "true"
7878
description: Execute the build with network isolation
7979
name: hermetic
8080
type: string
81-
- default: ""
81+
- default: '{"packages": [{"type": "gomod"}], "flags": ["gomod-vendor-check"]}'
8282
description: Build dependencies to be prefetched by Cachi2
8383
name: prefetch-input
8484
type: string
8585
- default: ""
8686
description: Image tag expiration time, time values could be something like
8787
1h, 2d, 3w for hours, days, and weeks, respectively.
8888
name: image-expires-after
89-
- default: "false"
89+
- default: "true"
9090
description: Build a source image.
9191
name: build-source-image
9292
type: string

Dockerfile

+18-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
FROM registry.redhat.io/ubi8/go-toolset:1.21 AS builder
22

3-
ENV S2I_GIT_VERSION="" \
4-
S2I_GIT_MAJOR="" \
5-
S2I_GIT_MINOR=""
3+
ENV S2I_GIT_VERSION="1.4.0" \
4+
S2I_GIT_MAJOR="1" \
5+
S2I_GIT_MINOR="4"
66

77
COPY . .
88

@@ -19,3 +19,18 @@ COPY --from=builder /tmp/s2i /usr/local/bin/s2i
1919
USER 1001
2020

2121
ENTRYPOINT [ "/usr/local/bin/s2i" ]
22+
23+
LABEL \
24+
name="source-to-image/source-to-image" \
25+
description="Source-to-Image is a builder image" \
26+
summary="Source-to-Image is a builder image" \
27+
version="1.4.1" \
28+
architecture="${GOARCH}" \
29+
vendor="Red Hat" \
30+
com.redhat.component="source-to-image-container" \
31+
maintainer="[email protected]" \
32+
io.k8s.description="Source-to-Image is a builder image" \
33+
io.k8s.display-name="Source-to-Image" \
34+
io.openshift.tags="source-to-image,s2i" \
35+
io.openshift.maintainer.product="OpenShift Container Platform" \
36+
io.openshift.maintainer.component="Source-to-Image" \

vendor/github.com/docker/distribution/reference/helpers_deprecated.go

-34
This file was deleted.

vendor/github.com/docker/distribution/reference/normalize_deprecated.go

-92
This file was deleted.

vendor/github.com/docker/distribution/reference/reference_deprecated.go

-172
This file was deleted.

0 commit comments

Comments
 (0)