Merge pull request tektoncd#730 from nikhil-thomas/fix/kodata-HEAD

Fix git HEAD not found error
nikhil-thomas · Aug 18, 2021 · 99217a5 · 99217a5
2 parents 29ceca1 + c296195
commit 99217a5
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 61 deletions.
diff --git a/openshift/ci-operator/Dockerfile-git.in b/openshift/ci-operator/Dockerfile-git.in
@@ -5,17 +5,14 @@ FROM registry.access.redhat.com/ubi8/ubi:latest
 # our local PATH.
 
 ENV KO_DATA_PATH=/kodata \
-    HOME=/ko-app PATH=DOLLAR{HOME}:DOLLAR{PATH}
+    HOME=/ko-app \
+    PATH=DOLLAR{HOME}:DOLLAR{PATH}
 RUN yum install --disableplugin=subscription-manager -y git openssh-clients
 
 COPY ${bin} DOLLAR{HOME}/${bin}.orig
 COPY uidwrapper DOLLAR{HOME}/${bin}
-
-WORKDIR /go/src/github.com/openshift/tektoncd-pipeline
-COPY ./.git/HEAD ${KO_DATA_PATH}/
-COPY ./.git/refs ${KO_DATA_PATH}/
-COPY ./third_party ${KO_DATA_PATH}/
-COPY ./LICENSE ${KO_DATA_PATH}/
+COPY HEAD ${KO_DATA_PATH}/
+COPY refs ${KO_DATA_PATH}/
 
 RUN chgrp -R 0 DOLLAR{HOME} && \
     chmod -R g=u DOLLAR{HOME} /etc/passwd

diff --git a/openshift/ci-operator/Dockerfile.in b/openshift/ci-operator/Dockerfile.in
@@ -3,11 +3,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
 ENV KO_DATA_PATH=/kodata
 ADD DOLLAR{bin} /ko-app/DOLLAR{bin}
-
-WORKDIR /go/src/github.com/openshift/tektoncd-pipeline
-COPY ./.git/HEAD ${KO_DATA_PATH}/
-COPY ./.git/refs ${KO_DATA_PATH}/
-COPY ./third_party ${KO_DATA_PATH}/
-COPY ./LICENSE ${KO_DATA_PATH}/
+COPY HEAD ${KO_DATA_PATH}/
+COPY refs ${KO_DATA_PATH}/
 
 ENTRYPOINT ["/ko-app/${bin}"]
diff --git a/openshift/ci-operator/tekton-images/controller/Dockerfile b/openshift/ci-operator/tekton-images/controller/Dockerfile
@@ -3,11 +3,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
 ENV KO_DATA_PATH=/kodata
 ADD ${bin} /ko-app/${bin}
-
-WORKDIR /go/src/github.com/openshift/tektoncd-pipeline
-COPY ./.git/HEAD /
-COPY ./.git/refs /
-COPY ./third_party /
-COPY ./LICENSE /
+COPY HEAD /
+COPY refs /
 
 ENTRYPOINT ["/ko-app/controller"]
diff --git a/openshift/ci-operator/tekton-images/entrypoint/Dockerfile b/openshift/ci-operator/tekton-images/entrypoint/Dockerfile
@@ -3,11 +3,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
 ENV KO_DATA_PATH=/kodata
 ADD ${bin} /ko-app/${bin}
-
-WORKDIR /go/src/github.com/openshift/tektoncd-pipeline
-COPY ./.git/HEAD /
-COPY ./.git/refs /
-COPY ./third_party /
-COPY ./LICENSE /
+COPY HEAD /
+COPY refs /
 
 ENTRYPOINT ["/ko-app/entrypoint"]
diff --git a/openshift/ci-operator/tekton-images/git-init/Dockerfile b/openshift/ci-operator/tekton-images/git-init/Dockerfile
@@ -5,17 +5,14 @@ FROM registry.access.redhat.com/ubi8/ubi:latest
 # our local PATH.
 
 ENV KO_DATA_PATH=/kodata \
-    HOME=/ko-app PATH=${HOME}:${PATH}
+    HOME=/ko-app \
+    PATH=${HOME}:${PATH}
 RUN yum install --disableplugin=subscription-manager -y git openssh-clients
 
 COPY git-init ${HOME}/git-init.orig
 COPY uidwrapper ${HOME}/git-init
-
-WORKDIR /go/src/github.com/openshift/tektoncd-pipeline
-COPY ./.git/HEAD /
-COPY ./.git/refs /
-COPY ./third_party /
-COPY ./LICENSE /
+COPY HEAD /
+COPY refs /
 
 RUN chgrp -R 0 ${HOME} && \
     chmod -R g=u ${HOME} /etc/passwd

diff --git a/openshift/ci-operator/tekton-images/imagedigestexporter/Dockerfile b/openshift/ci-operator/tekton-images/imagedigestexporter/Dockerfile
@@ -3,11 +3,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
 ENV KO_DATA_PATH=/kodata
 ADD ${bin} /ko-app/${bin}
-
-WORKDIR /go/src/github.com/openshift/tektoncd-pipeline
-COPY ./.git/HEAD /
-COPY ./.git/refs /
-COPY ./third_party /
-COPY ./LICENSE /
+COPY HEAD /
+COPY refs /
 
 ENTRYPOINT ["/ko-app/imagedigestexporter"]
diff --git a/openshift/ci-operator/tekton-images/kubeconfigwriter/Dockerfile b/openshift/ci-operator/tekton-images/kubeconfigwriter/Dockerfile
@@ -3,11 +3,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
 ENV KO_DATA_PATH=/kodata
 ADD ${bin} /ko-app/${bin}
-
-WORKDIR /go/src/github.com/openshift/tektoncd-pipeline
-COPY ./.git/HEAD /
-COPY ./.git/refs /
-COPY ./third_party /
-COPY ./LICENSE /
+COPY HEAD /
+COPY refs /
 
 ENTRYPOINT ["/ko-app/kubeconfigwriter"]
diff --git a/openshift/ci-operator/tekton-images/nop/Dockerfile b/openshift/ci-operator/tekton-images/nop/Dockerfile
@@ -11,11 +11,9 @@ RUN for i in /usr/bin/* /usr/sbin/* /bin/* /sbin/*;do \
 
 ENV KO_DATA_PATH=/kodata
 
-WORKDIR /go/src/github.com/openshift/tektoncd-pipeline
-COPY ./.git/HEAD ${KO_DATA_PATH}/
-COPY ./.git/refs ${KO_DATA_PATH}/
-COPY ./third_party ${KO_DATA_PATH}/
-COPY ./LICENSE ${KO_DATA_PATH}/
+COPY HEAD ${KO_DATA_PATH}/
+COPY refs ${KO_DATA_PATH}/
+
 
 ADD nop /ko-app/nop
 ENTRYPOINT ["/ko-app/nop"]
diff --git a/openshift/ci-operator/tekton-images/pullrequest-init/Dockerfile b/openshift/ci-operator/tekton-images/pullrequest-init/Dockerfile
@@ -3,11 +3,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
 ENV KO_DATA_PATH=/kodata
 ADD ${bin} /ko-app/${bin}
-
-WORKDIR /go/src/github.com/openshift/tektoncd-pipeline
-COPY ./.git/HEAD /
-COPY ./.git/refs /
-COPY ./third_party /
-COPY ./LICENSE /
+COPY HEAD /
+COPY refs /
 
 ENTRYPOINT ["/ko-app/pullrequest-init"]
diff --git a/openshift/ci-operator/tekton-images/webhook/Dockerfile b/openshift/ci-operator/tekton-images/webhook/Dockerfile
@@ -3,11 +3,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
 ENV KO_DATA_PATH=/kodata
 ADD ${bin} /ko-app/${bin}
-
-WORKDIR /go/src/github.com/openshift/tektoncd-pipeline
-COPY ./.git/HEAD /
-COPY ./.git/refs /
-COPY ./third_party /
-COPY ./LICENSE /
+COPY HEAD /
+COPY refs /
 
 ENTRYPOINT ["/ko-app/webhook"]