From 9c46e03a9c155897d4424682e66ad95e0a36c41b Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 10:45:35 -0800 Subject: [PATCH 01/23] Update frogbot-scan-pr.yml --- .github/workflows/frogbot-scan-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/frogbot-scan-pr.yml b/.github/workflows/frogbot-scan-pr.yml index 798d3cb..91fc49f 100644 --- a/.github/workflows/frogbot-scan-pr.yml +++ b/.github/workflows/frogbot-scan-pr.yml @@ -47,7 +47,7 @@ jobs: # [Mandatory] # JFrog platform URL - JF_URL: https://${{ vars.JF_URL }}/ + JF_URL: ${{ vars.JF_URL }}/ # [Mandatory if JF_USER and JF_PASSWORD are not provided] # JFrog access token with 'read' permissions on Xray service From b2832da4038414c16344c0fa551ed62875cd2404 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 10:51:53 -0800 Subject: [PATCH 02/23] Update frogbot-scan-pr.yml --- .github/workflows/frogbot-scan-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/frogbot-scan-pr.yml b/.github/workflows/frogbot-scan-pr.yml index 91fc49f..f4baf4c 100644 --- a/.github/workflows/frogbot-scan-pr.yml +++ b/.github/workflows/frogbot-scan-pr.yml @@ -47,7 +47,7 @@ jobs: # [Mandatory] # JFrog platform URL - JF_URL: ${{ vars.JF_URL }}/ + JF_URL: ${{ vars.JF_URL }} # [Mandatory if JF_USER and JF_PASSWORD are not provided] # JFrog access token with 'read' permissions on Xray service From 6d09990cb54814fd039d6fe5f34e61c55257badb Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 11:17:47 -0800 Subject: [PATCH 03/23] Update frogbot-scan-and-fix.yml --- .github/workflows/frogbot-scan-and-fix.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/frogbot-scan-and-fix.yml b/.github/workflows/frogbot-scan-and-fix.yml index c3b8ae4..7f94ab8 100644 --- a/.github/workflows/frogbot-scan-and-fix.yml +++ b/.github/workflows/frogbot-scan-and-fix.yml @@ -17,9 +17,9 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: jfrog/frogbot@7fad842cf6ba3d755c2eb86376cce066327b55d1 + - uses: jfrog/frogbot@v2 env: - JF_URL: ${{ vars.JF_URL }}/ + JF_URL: ${{ vars.JF_URL }} JF_ACCESS_TOKEN: ${{ secrets.JF_ACCESS_TOKEN }} JF_GIT_TOKEN: ${{ secrets.GITHUB_TOKEN }} JF_PROJECT: ${{ vars.JF_PROJECT }} From 67001264c9426a44b89f5ab9a2c511b5a3dd0e95 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 11:21:16 -0800 Subject: [PATCH 04/23] Update build-publish.yml --- .github/workflows/build-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml index 06ec1f1..880645d 100644 --- a/.github/workflows/build-publish.yml +++ b/.github/workflows/build-publish.yml @@ -14,7 +14,7 @@ jobs: env: DOCKER_REPO: 'codeninjas-proj-docker-local' IMAGE_NAME: 'my-very-cool-image:${{ github.run_number }}' - JF_URL: https://${{ vars.JF_URL }}/ + JF_URL: ${{ vars.JF_URL }} DOCKER_CLI_EXPERIMENTAL: enabled steps: # Use the specific setup-cli branch @@ -22,7 +22,7 @@ jobs: uses: jfrog/setup-jfrog-cli@v4 id: setup-cli env: - JF_URL: https://${{ vars.JF_URL }}/ + JF_URL: ${{ vars.JF_URL }} JF_PROJECT: ${{ vars.JF_PROJECT }} with: oidc-provider-name: jfrog-github-oidc From ad56f97f37d318bf0f6048fc9665191ec3a15f01 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 11:26:43 -0800 Subject: [PATCH 05/23] Update build-publish.yml --- .github/workflows/build-publish.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml index 880645d..f07c213 100644 --- a/.github/workflows/build-publish.yml +++ b/.github/workflows/build-publish.yml @@ -24,13 +24,9 @@ jobs: env: JF_URL: ${{ vars.JF_URL }} JF_PROJECT: ${{ vars.JF_PROJECT }} - with: - oidc-provider-name: jfrog-github-oidc - + JF_ACCESS_TOKEN: ${{ secrets.JF_ACCESS_TOKEN }} - name: Checkout the repository uses: actions/checkout@v4 - - - name: configure jfrog environment run: | # Use a curated repository for python dependencies resolution From 0e09142ef3402301813037f30b8be5ccf855329a Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 11:34:37 -0800 Subject: [PATCH 06/23] Update requirements.txt --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 411c6bd..f686919 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ PyYAML>3.11 -nltk -redis == 4.6.0 \ No newline at end of file +nltk>3.9 +redis == 4.6.0 From 476c62c73f27fcd68a30951ffc62d2d0430faafd Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 11:40:04 -0800 Subject: [PATCH 07/23] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 366b5ea..304dab9 100644 --- a/setup.py +++ b/setup.py @@ -10,5 +10,5 @@ author_email='jfrog@jfrog.com', url='https://github.com/carmithersh/carmit-testing', packages=['pythonExample'], - install_requires=['PyYAML>3.11', 'nltk'], + install_requires=['PyYAML>3.11', 'nltk>3.9'], ) From 22893fb47653f52028de613339e21e708c56f67d Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 11:58:26 -0800 Subject: [PATCH 08/23] Update frogbot-scan-and-fix.yml --- .github/workflows/frogbot-scan-and-fix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/frogbot-scan-and-fix.yml b/.github/workflows/frogbot-scan-and-fix.yml index 7f94ab8..199af0a 100644 --- a/.github/workflows/frogbot-scan-and-fix.yml +++ b/.github/workflows/frogbot-scan-and-fix.yml @@ -22,5 +22,5 @@ jobs: JF_URL: ${{ vars.JF_URL }} JF_ACCESS_TOKEN: ${{ secrets.JF_ACCESS_TOKEN }} JF_GIT_TOKEN: ${{ secrets.GITHUB_TOKEN }} - JF_PROJECT: ${{ vars.JF_PROJECT }} + #JF_PROJECT: ${{ vars.JF_PROJECT }} JF_GIT_BASE_BRANCH: ${{ matrix.branch }} From e0a24a3a9fec987763dd2263f57faaaa452aa264 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 12:13:06 -0800 Subject: [PATCH 09/23] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f686919..81a7f02 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ PyYAML>3.11 -nltk>3.9 +nltk == 3.9.1 redis == 4.6.0 From d09d481c45c73fc524ed5a60deb66fd4d5c590df Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 12:36:37 -0800 Subject: [PATCH 10/23] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 81a7f02..52bc25c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ PyYAML>3.11 -nltk == 3.9.1 +nltk==3.6.5 redis == 4.6.0 From 10964cc6b0bfa70dd93a79ecadfd55bacfe9b690 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 13:15:15 -0800 Subject: [PATCH 11/23] Update frogbot-scan-pr.yml --- .github/workflows/frogbot-scan-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/frogbot-scan-pr.yml b/.github/workflows/frogbot-scan-pr.yml index f4baf4c..4549d74 100644 --- a/.github/workflows/frogbot-scan-pr.yml +++ b/.github/workflows/frogbot-scan-pr.yml @@ -76,4 +76,4 @@ jobs: # dependencies from a virtual repository in Artifactory, set the name of of the repository. There's no # need to set this value, if it is set in the frogbot-config.yml file. # JF_DEPS_REPO: "" - JF_PROJECT: ${{ vars.JF_PROJECT }} + #JF_PROJECT: ${{ vars.JF_PROJECT }} From b882829fec44300503c783fbec329b754ec0ee98 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 13:34:37 -0800 Subject: [PATCH 12/23] Update requirements.txt --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 52bc25c..a34d3f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ PyYAML>3.11 -nltk==3.6.5 redis == 4.6.0 From 709a547f6dd02440b0592dfdca1b46ff534a48ef Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 13:34:53 -0800 Subject: [PATCH 13/23] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 304dab9..6bbc88f 100644 --- a/setup.py +++ b/setup.py @@ -10,5 +10,5 @@ author_email='jfrog@jfrog.com', url='https://github.com/carmithersh/carmit-testing', packages=['pythonExample'], - install_requires=['PyYAML>3.11', 'nltk>3.9'], + install_requires=['PyYAML>3.11'], ) From 772a8fb4463200ea165f560fac83a4c591392e56 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 13:36:01 -0800 Subject: [PATCH 14/23] Update requirements.txt --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a34d3f4..15a2edc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1 @@ PyYAML>3.11 -redis == 4.6.0 From 2d91df41992bd7e852552aef8fdf4cdf70541ae0 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 14:23:11 -0800 Subject: [PATCH 15/23] Update build-publish.yml --- .github/workflows/build-publish.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml index f07c213..0b9d112 100644 --- a/.github/workflows/build-publish.yml +++ b/.github/workflows/build-publish.yml @@ -48,9 +48,13 @@ jobs: - name: publish python package run: | - jf rt u dist/ codeninjas-proj-python-virtual/example-projects/ --module=jfrog-python-example - - + jf rt u dist/ byron-py-pypi/ --module=jfrog-python-example + - name: Publish Build info With JFrog CLI + run: | + jf rt build-collect-env + jf rt build-add-git + jf rt build-publish + - name: Set up QEMU uses: docker/setup-qemu-action@v3 From 08f150fcd1a777fcd785487a15ced286cd676e13 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 15:45:21 -0800 Subject: [PATCH 16/23] Update build-publish.yml --- .github/workflows/build-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml index 0b9d112..a6d59f8 100644 --- a/.github/workflows/build-publish.yml +++ b/.github/workflows/build-publish.yml @@ -12,8 +12,8 @@ jobs: build-publish-python: runs-on: ubuntu-latest env: - DOCKER_REPO: 'codeninjas-proj-docker-local' - IMAGE_NAME: 'my-very-cool-image:${{ github.run_number }}' + DOCKER_REPO: 'jfrog-example' + IMAGE_NAME: 'jfrog-example-image:${{ github.run_number }}' JF_URL: ${{ vars.JF_URL }} DOCKER_CLI_EXPERIMENTAL: enabled steps: From b4837e84d5f7446defd2e0abbbca5555fe41cd58 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Wed, 12 Feb 2025 09:29:14 -0800 Subject: [PATCH 17/23] Update build-publish.yml --- .github/workflows/build-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml index a6d59f8..8fd7144 100644 --- a/.github/workflows/build-publish.yml +++ b/.github/workflows/build-publish.yml @@ -62,8 +62,8 @@ jobs: uses: docker/login-action@v3 with: registry: ${{ vars.JF_URL }} - username: ${{ steps.setup-cli.outputs.oidc-user }} - password: ${{ steps.setup-cli.outputs.oidc-token }} + username: ${{ vars.JF_USER }} + password: ${{ secrets.JF_TOKEN }} - name: Setup buildx instance uses: docker/setup-buildx-action@v3 From 966f5e9839fc52a93434246100c309e87718aca6 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Wed, 12 Feb 2025 09:32:01 -0800 Subject: [PATCH 18/23] Update build-publish.yml --- .github/workflows/build-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml index 8fd7144..0476837 100644 --- a/.github/workflows/build-publish.yml +++ b/.github/workflows/build-publish.yml @@ -63,7 +63,7 @@ jobs: with: registry: ${{ vars.JF_URL }} username: ${{ vars.JF_USER }} - password: ${{ secrets.JF_TOKEN }} + password: ${{ secrets.JF_ACCESS_TOKEN }} - name: Setup buildx instance uses: docker/setup-buildx-action@v3 From 4c3456eb70e6cc82ec8808bdc7759f6991af48f0 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Wed, 12 Feb 2025 09:46:02 -0800 Subject: [PATCH 19/23] Update build-publish.yml --- .github/workflows/build-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml index 0476837..9201ee7 100644 --- a/.github/workflows/build-publish.yml +++ b/.github/workflows/build-publish.yml @@ -76,7 +76,7 @@ jobs: run: | docker buildx ls jf docker --version - jf docker build --tag ${{ vars.JF_URL }}/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }} --platform linux/amd64,linux/arm64 --metadata-file metadata.json --push . + jf docker build --tag ${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }} --platform linux/amd64,linux/arm64 --metadata-file metadata.json --push . - name: docker scan run: | From b868b4ef4305ca2d9f38905394b23d44e824745c Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Wed, 12 Feb 2025 09:55:10 -0800 Subject: [PATCH 20/23] Update build-publish.yml --- .github/workflows/build-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml index 9201ee7..0476837 100644 --- a/.github/workflows/build-publish.yml +++ b/.github/workflows/build-publish.yml @@ -76,7 +76,7 @@ jobs: run: | docker buildx ls jf docker --version - jf docker build --tag ${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }} --platform linux/amd64,linux/arm64 --metadata-file metadata.json --push . + jf docker build --tag ${{ vars.JF_URL }}/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }} --platform linux/amd64,linux/arm64 --metadata-file metadata.json --push . - name: docker scan run: | From b3528b1896ac9d2d554fc540c8974b1a9eba640a Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Wed, 12 Feb 2025 09:58:30 -0800 Subject: [PATCH 21/23] Update build-publish.yml --- .github/workflows/build-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml index 0476837..ea146bd 100644 --- a/.github/workflows/build-publish.yml +++ b/.github/workflows/build-publish.yml @@ -76,7 +76,7 @@ jobs: run: | docker buildx ls jf docker --version - jf docker build --tag ${{ vars.JF_URL }}/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }} --platform linux/amd64,linux/arm64 --metadata-file metadata.json --push . + jf docker build --tag ${{ vars.JF_URL_NO_HTTP }}/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }} --platform linux/amd64,linux/arm64 --metadata-file metadata.json --push . - name: docker scan run: | From 8f8b7e530487633821b54246e50836e5541e7625 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Wed, 12 Feb 2025 10:11:24 -0800 Subject: [PATCH 22/23] Update build-publish.yml --- .github/workflows/build-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml index ea146bd..2e749da 100644 --- a/.github/workflows/build-publish.yml +++ b/.github/workflows/build-publish.yml @@ -80,8 +80,8 @@ jobs: - name: docker scan run: | - jf docker pull ${{ vars.JF_URL }}/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }} - jf docker scan ${{ vars.JF_URL }}/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }} + jf docker pull ${{ vars.JF_URL_NO_HTTP }}/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }} + jf docker scan ${{ vars.JF_URL_NO_HTTP }}/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }} #- name: docker build # run: | # jf docker build --tag ${{ vars.JF_URL }}/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }}-amd64 --platform linux/amd64 --load . From ccdbec64fc250336435cc2bf62d82b94cfaac7fd Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Wed, 12 Feb 2025 10:17:27 -0800 Subject: [PATCH 23/23] Update build-publish.yml --- .github/workflows/build-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml index 2e749da..c115bf5 100644 --- a/.github/workflows/build-publish.yml +++ b/.github/workflows/build-publish.yml @@ -109,7 +109,7 @@ jobs: echo "----------------" digest=$(cat metadata.json | jq '.["containerimage.digest"]') echo "digest=$digest" - echo "${{ vars.JF_URL }}/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }}@$digest" > metadata.json + echo "${{ vars.JF_URL_NO_HTTP }}/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }}@$digest" > metadata.json jf rt build-docker-create ${{ env.DOCKER_REPO }} --image-file metadata.json - name: publish build info