Skip to content

Commit fe25e8e

Browse files
committed
Update dockerfile and rpms
Signed-off-by: savitaashture <[email protected]>
1 parent ce7d0d1 commit fe25e8e

File tree

3 files changed

+1596
-64
lines changed

3 files changed

+1596
-64
lines changed

.konflux/dockerfiles/git-init.Dockerfile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN set -e; for f in patches/*.patch; do echo ${f}; [[ -f ${f} ]] || continue; g
1010
COPY head HEAD
1111
ENV GODEBUG="http2server=0"
1212
ENV GOEXPERIMENT=strictfipsruntime
13-
RUN cd image/git-init && go build -ldflags="-X 'knative.dev/pkg/changeset.rev=${CHANGESET_REV:0:7}'" -mod=vendor -tags strictfipsruntime -v -o /tmp/tektoncd-catalog-git-clone
13+
RUN cd image/git-init && go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags strictfipsruntime -v -o /tmp/tektoncd-catalog-git-clone
1414

1515
FROM $RUNTIME
1616
ARG VERSION=git-init-1.17.2
@@ -19,8 +19,12 @@ ENV BINARY=git-init \
1919
KO_APP=/ko-app \
2020
KO_DATA_PATH=/kodata
2121

22+
RUN dnf install -y openssh-clients git git-lfs shadow-utils
23+
2224
COPY --from=builder /tmp/tektoncd-catalog-git-clone ${KO_APP}/${BINARY}
2325
COPY head ${KO_DATA_PATH}/HEAD
26+
RUN chgrp -R 0 ${KO_APP} && \
27+
chmod -R g+rwX ${KO_APP}
2428

2529
LABEL \
2630
com.redhat.component="openshift-pipelines-git-init-rhel8-container" \
@@ -30,10 +34,10 @@ LABEL \
3034
maintainer="[email protected]" \
3135
description="Red Hat OpenShift Pipelines Git-init" \
3236
io.k8s.display-name="Red Hat OpenShift Pipelines Git-init" \
33-
io.k8s.description="Red Hat OpenShift Pipelines Git-init" \
37+
io.k8s.description="git-init is a binary that makes it easy to clone a repository from a Tekton Task. It is usually used via the git-clone Tasks." \
3438
io.openshift.tags="pipelines,tekton,openshift"
3539

36-
RUN groupadd -r -g 65532 nonroot && useradd --no-log-init -r -u 65532 -g nonroot nonroot
40+
RUN groupadd -r -g 65532 nonroot && useradd --no-log-init -r -u 65532 -g nonroot -d /home/git -m nonroot
3741
USER 65532
3842

3943
ENTRYPOINT ["/ko-app/git-init"]

.konflux/rpms/rpms.in.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
contentOrigin:
22
repofiles:
33
- ./ubi.repo
4-
packages: [shadow-utils]
4+
packages: [openssh-clients, git, git-lfs, shadow-utils]
55
arches:
66
# The list of architectures
77
- aarch64

0 commit comments

Comments
 (0)