Skip to content

Commit 4fdbbb8

Browse files
Merge pull request #10 from byron-github-school/main
Forward Merge
2 parents f51ec58 + 4d307b9 commit 4fdbbb8

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

.github/workflows/build-publish.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ jobs:
2727
JF_ACCESS_TOKEN: ${{ secrets.JF_ACCESS_TOKEN }}
2828
- name: Checkout the repository
2929
uses: actions/checkout@v4
30-
31-
3230
- name: configure jfrog environment
3331
run: |
3432
# Use a curated repository for python dependencies resolution
@@ -56,7 +54,7 @@ jobs:
5654
jf rt build-collect-env
5755
jf rt build-add-git
5856
jf rt build-publish
59-
57+
6058
- name: Set up QEMU
6159
uses: docker/setup-qemu-action@v3
6260

@@ -78,12 +76,12 @@ jobs:
7876
run: |
7977
docker buildx ls
8078
jf docker --version
81-
jf docker build --tag ${{ vars.JF_URL }}/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }} --platform linux/amd64,linux/arm64 --metadata-file metadata.json --push .
79+
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 .
8280
8381
- name: docker scan
8482
run: |
85-
jf docker pull ${{ vars.JF_URL }}/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }}
86-
jf docker scan ${{ vars.JF_URL }}/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }}
83+
jf docker pull ${{ vars.JF_URL_NO_HTTP }}/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }}
84+
jf docker scan ${{ vars.JF_URL_NO_HTTP }}/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }}
8785
#- name: docker build
8886
# run: |
8987
# jf docker build --tag ${{ vars.JF_URL }}/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }}-amd64 --platform linux/amd64 --load .
@@ -111,7 +109,7 @@ jobs:
111109
echo "----------------"
112110
digest=$(cat metadata.json | jq '.["containerimage.digest"]')
113111
echo "digest=$digest"
114-
echo "${{ vars.JF_URL }}/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }}@$digest" > metadata.json
112+
echo "${{ vars.JF_URL_NO_HTTP }}/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }}@$digest" > metadata.json
115113
jf rt build-docker-create ${{ env.DOCKER_REPO }} --image-file metadata.json
116114
117115
- name: publish build info

0 commit comments

Comments
 (0)