fix: change registry org to jx

- Also uses crane to get the digest sha, as cosign prefers digest sha over tags (they will remove the ability to use tags in the future) - Removed jenkins-x-pr.yaml as it's not being used Signed-off-by: ankitm123 <[email protected]>
jenkins-x · Oct 24, 2022 · 3153604 · 3153604
1 parent 1ea08b7
commit 3153604
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 26 deletions.
diff --git a/.github/workflows/jenkins-x-pr.yaml b/.github/workflows/jenkins-x-pr.yaml
diff --git a/.github/workflows/jenkins-x-release.yaml b/.github/workflows/jenkins-x-release.yaml
@@ -111,19 +111,29 @@ jobs:
         DOCKER_REGISTRY_ORG: jenkins-x
         REPO_NAME: ${{ github.event.repository.name }}
         VERSION: ${{ steps.prep.outputs.version }}
+    - uses: imjasonh/[email protected]
+    - name: get image digest
+      env:
+        VERSION: ${{ steps.prep.outputs.version }}
+      run: |
+        DIGEST_SHA_JX_BOOT=$(crane digest ghcr.io/jenkins-x/jx-boot:$VERSION)
+        DIGEST_SHA_JX=$(crane digest ghcr.io/jenkins-x/jx:$VERSION)
+        echo "DIGEST_SHA_JX_BOOT=${DIGEST_SHA_JX_BOOT}" >> $GITHUB_ENV
+        echo "DIGEST_SHA_JX=${DIGEST_SHA_JX}" >> $GITHUB_ENV
     - name: cosign-installer
       uses: sigstore/[email protected]
     - name: Sign the published Docker image
       env:
         COSIGN_PASSWORD: ${{secrets.COSIGN_PWD}}
         COSIGN_PRIVATE_KEY: ${{secrets.COSIGN_PRIVATE_KEY}}
         GITHUB_TOKEN: ${{ secrets.GIT_BOT_TOKEN }}
+        # ToDo: We should change this to some other user, a test account pushing images and artifacts for jx org sounds wrong!
         GIT_USERNAME: jenkins-x-bot-test
-        DOCKER_REGISTRY_ORG: jenkins-x-bot-test
+        DOCKER_REGISTRY_ORG: jenkins-x
         REPO_NAME: ${{ github.event.repository.name }}
       run: |
-        cosign sign --key=env://COSIGN_PRIVATE_KEY ghcr.io/$DOCKER_REGISTRY_ORG/$REPO_NAME:$VERSION
-        cosign sign --key=env://COSIGN_PRIVATE_KEY ghcr.io/$DOCKER_REGISTRY_ORG/jx-boot:$VERSION
+        cosign sign --key=env://COSIGN_PRIVATE_KEY ghcr.io/$DOCKER_REGISTRY_ORG/$REPO_NAME:$DIGEST_SHA_JX
+        cosign sign --key=env://COSIGN_PRIVATE_KEY ghcr.io/$DOCKER_REGISTRY_ORG/jx-boot:$DIGEST_SHA_JX_BOOT
   release2:
     if: github.repository_owner == 'jenkins-x'
     runs-on: ubuntu-latest

diff --git a/cmd/docs/main.go b/cmd/docs/main.go
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/cmd/docs/md_docs.go b/cmd/docs/md_docs.go
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/hack/linter.sh b/hack/linter.sh
@@ -11,7 +11,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 linterVersion="$(golangci-lint --version | awk '{print $4}')"
 
-expectedLinterVersion=1.46.2
+expectedLinterVersion=1.50.1
 
 if [ "${linterVersion}" != "${expectedLinterVersion}" ]; then
 	echo "Install GolangCI-Lint version ${expectedLinterVersion}"