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

Minor fix: escape 'envsubst' using 'DOLLAR'
nikhil-thomas · Aug 18, 2021 · 5fe5fb1 · 5fe5fb1
2 parents 99217a5 + 8cf2d3e
commit 5fe5fb1
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/openshift/ci-operator/Dockerfile-git.in b/openshift/ci-operator/Dockerfile-git.in
@@ -11,8 +11,8 @@ RUN yum install --disableplugin=subscription-manager -y git openssh-clients
 
 COPY ${bin} DOLLAR{HOME}/${bin}.orig
 COPY uidwrapper DOLLAR{HOME}/${bin}
-COPY HEAD ${KO_DATA_PATH}/
-COPY refs ${KO_DATA_PATH}/
+COPY HEAD DOLLAR{KO_DATA_PATH}/
+COPY refs DOLLAR{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,7 +3,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
 ENV KO_DATA_PATH=/kodata
 ADD DOLLAR{bin} /ko-app/DOLLAR{bin}
-COPY HEAD ${KO_DATA_PATH}/
-COPY refs ${KO_DATA_PATH}/
+COPY HEAD DOLLAR{KO_DATA_PATH}/
+COPY refs DOLLAR{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,7 +3,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
 ENV KO_DATA_PATH=/kodata
 ADD ${bin} /ko-app/${bin}
-COPY HEAD /
-COPY refs /
+COPY HEAD ${KO_DATA_PATH}/
+COPY refs ${KO_DATA_PATH}/
 
 ENTRYPOINT ["/ko-app/controller"]
diff --git a/openshift/ci-operator/tekton-images/entrypoint/Dockerfile b/openshift/ci-operator/tekton-images/entrypoint/Dockerfile
@@ -3,7 +3,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
 ENV KO_DATA_PATH=/kodata
 ADD ${bin} /ko-app/${bin}
-COPY HEAD /
-COPY refs /
+COPY HEAD ${KO_DATA_PATH}/
+COPY refs ${KO_DATA_PATH}/
 
 ENTRYPOINT ["/ko-app/entrypoint"]
diff --git a/openshift/ci-operator/tekton-images/git-init/Dockerfile b/openshift/ci-operator/tekton-images/git-init/Dockerfile
@@ -11,8 +11,8 @@ RUN yum install --disableplugin=subscription-manager -y git openssh-clients
 
 COPY git-init ${HOME}/git-init.orig
 COPY uidwrapper ${HOME}/git-init
-COPY HEAD /
-COPY refs /
+COPY HEAD ${KO_DATA_PATH}/
+COPY refs ${KO_DATA_PATH}/
 
 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,7 +3,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
 ENV KO_DATA_PATH=/kodata
 ADD ${bin} /ko-app/${bin}
-COPY HEAD /
-COPY refs /
+COPY HEAD ${KO_DATA_PATH}/
+COPY refs ${KO_DATA_PATH}/
 
 ENTRYPOINT ["/ko-app/imagedigestexporter"]
diff --git a/openshift/ci-operator/tekton-images/kubeconfigwriter/Dockerfile b/openshift/ci-operator/tekton-images/kubeconfigwriter/Dockerfile
@@ -3,7 +3,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
 ENV KO_DATA_PATH=/kodata
 ADD ${bin} /ko-app/${bin}
-COPY HEAD /
-COPY refs /
+COPY HEAD ${KO_DATA_PATH}/
+COPY refs ${KO_DATA_PATH}/
 
 ENTRYPOINT ["/ko-app/kubeconfigwriter"]
diff --git a/openshift/ci-operator/tekton-images/pullrequest-init/Dockerfile b/openshift/ci-operator/tekton-images/pullrequest-init/Dockerfile
@@ -3,7 +3,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
 ENV KO_DATA_PATH=/kodata
 ADD ${bin} /ko-app/${bin}
-COPY HEAD /
-COPY refs /
+COPY HEAD ${KO_DATA_PATH}/
+COPY refs ${KO_DATA_PATH}/
 
 ENTRYPOINT ["/ko-app/pullrequest-init"]
diff --git a/openshift/ci-operator/tekton-images/webhook/Dockerfile b/openshift/ci-operator/tekton-images/webhook/Dockerfile
@@ -3,7 +3,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
 ENV KO_DATA_PATH=/kodata
 ADD ${bin} /ko-app/${bin}
-COPY HEAD /
-COPY refs /
+COPY HEAD ${KO_DATA_PATH}/
+COPY refs ${KO_DATA_PATH}/
 
 ENTRYPOINT ["/ko-app/webhook"]