1
0
mirror of https://github.com/openshift/source-to-image.git synced 2026-02-05 12:44:54 +01:00

Fix enterprise contract violations

Changes:
- Required labels added
- Hermetic build enabled
- Source image build enabled
This commit is contained in:
Sayan Biswas
2024-09-30 00:42:27 +05:30
committed by Sayan Biswas
parent 739b5e3ffb
commit 70d1fb5197
3 changed files with 24 additions and 9 deletions

View File

@@ -77,11 +77,11 @@ spec:
description: Skip checks against built image
name: skip-checks
type: string
- default: "false"
- default: "true"
description: Execute the build with network isolation
name: hermetic
type: string
- default: ""
- default: '{"packages": [{"type": "gomod"}], "flags": ["gomod-vendor-check"]}'
description: Build dependencies to be prefetched by Cachi2
name: prefetch-input
type: string
@@ -89,7 +89,7 @@ spec:
description: Image tag expiration time, time values could be something like
1h, 2d, 3w for hours, days, and weeks, respectively.
name: image-expires-after
- default: "false"
- default: "true"
description: Build a source image.
name: build-source-image
type: string

View File

@@ -74,11 +74,11 @@ spec:
description: Skip checks against built image
name: skip-checks
type: string
- default: "false"
- default: "true"
description: Execute the build with network isolation
name: hermetic
type: string
- default: ""
- default: '{"packages": [{"type": "gomod"}], "flags": ["gomod-vendor-check"]}'
description: Build dependencies to be prefetched by Cachi2
name: prefetch-input
type: string
@@ -86,7 +86,7 @@ spec:
description: Image tag expiration time, time values could be something like
1h, 2d, 3w for hours, days, and weeks, respectively.
name: image-expires-after
- default: "false"
- default: "true"
description: Build a source image.
name: build-source-image
type: string

View File

@@ -1,8 +1,8 @@
FROM registry.redhat.io/ubi8/go-toolset:1.21 AS builder
ENV S2I_GIT_VERSION="" \
S2I_GIT_MAJOR="" \
S2I_GIT_MINOR=""
ENV S2I_GIT_VERSION="1.4.0" \
S2I_GIT_MAJOR="1" \
S2I_GIT_MINOR="4"
COPY . .
@@ -19,3 +19,18 @@ COPY --from=builder /tmp/s2i /usr/local/bin/s2i
USER 1001
ENTRYPOINT [ "/usr/local/bin/s2i" ]
LABEL \
name="source-to-image/source-to-image" \
description="Source-to-Image is a builder image" \
summary="Source-to-Image is a builder image" \
version="1.4.0" \
architecture="${GOARCH}" \
vendor="Red Hat, Inc." \
com.redhat.component="source-to-image-container" \
maintainer="openshift-builds@redhat.com" \
io.k8s.description="Source-to-Image is a builder image" \
io.k8s.display-name="Source-to-Image" \
io.openshift.tags="source-to-image,s2i" \
io.openshift.maintainer.product="OpenShift Container Platform" \
io.openshift.maintainer.component="Source-to-Image" \