Skip to content

Commit

Permalink
fix-dirty-tag
Browse files Browse the repository at this point in the history
  • Loading branch information
JasonPowr committed Oct 1, 2024
1 parent a5dde38 commit 5affec3
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*.out

# Dependency directories (remove the comment below to include it)
# vendor/
vendor/

# cosign stuff
/cosign*
Expand Down
3 changes: 1 addition & 2 deletions .tekton/client-server-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ metadata:
build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
== "main"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" && ( "Dockerfile.clients.rh".pathChanged() || ".tekton/client-server-pull-request.yaml".pathChanged() || "trigger-konflux-builds.txt".pathChanged() )
creationTimestamp: null
labels:
appstudio.openshift.io/application: cli
Expand Down
3 changes: 1 addition & 2 deletions .tekton/client-server-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ metadata:
build.appstudio.redhat.com/commit_sha: '{{revision}}'
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
== "main"
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "main" && ( "Dockerfile.clients.rh".pathChanged() || ".tekton/client-server-push.yaml".pathChanged() || "trigger-konflux-builds.txt".pathChanged() )
creationTimestamp: null
labels:
appstudio.openshift.io/application: cli
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.cosign.rh
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@ WORKDIR /cosign
COPY . .
USER root
RUN git config --global --add safe.directory /cosign && \
# git stash && \
git update-index --assume-unchanged Dockerfile.cosign.rh && \
export GIT_VERSION=$(git describe --tags --always --dirty) && \
export GIT_HASH=$(git rev-parse HEAD) && \
export BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') && \
# git stash pop && \
go mod vendor && \
make -f Build.mak cross-platform && \
cp cosign-linux-amd64 cosign && \
Expand All @@ -19,7 +18,8 @@ RUN git config --global --add safe.directory /cosign && \
gzip cosign-linux-arm64 && \
gzip cosign-darwin-amd64 && \
gzip cosign-darwin-arm64 && \
gzip cosign-windows-amd64.exe
gzip cosign-windows-amd64.exe && \
git update-index --no-assume-unchanged Dockerfile.cosign.rh

# Install Cosign
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:73f7dcacb460dad137a58f24668470a5a2e47378838a0190eef0ab532c6e8998
Expand Down Expand Up @@ -58,4 +58,4 @@ RUN chgrp -R 0 /${HOME} && chmod -R g=u /${HOME}
WORKDIR ${HOME}

# Makes sure the container stays running
CMD ["tail", "-f", "/dev/null"]
CMD ["tail", "-f", "/dev/null"]

0 comments on commit 5affec3

Please sign in to comment.