@@ -320,19 +320,12 @@ jobs:
320320
321321 - name : Debug ref tag
322322 run : echo ${{ env.REF_TAG }}
323-
324- - name : Login to GitHub Container Registry
325- uses : docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
326- with :
327- registry : ghcr.io
328- username : ${{ github.repository_owner }}
329- password : ${{ secrets.GITHUB_TOKEN }}
330323
331324 - name : Login to Docker Hub
332325 uses : docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
333326 with :
334- username : ${{ secrets.ORB_DOCKERHUB_USERNAME }}
335- password : ${{ secrets.ORB_DOCKERHUB_TOKEN }}
327+ username : ${{ secrets.DOCKERHUB_USERNAME }}
328+ password : ${{ secrets.DOCKERHUB_TOKEN }}
336329
337330 - name : Replace token
338331 run : |
@@ -353,27 +346,24 @@ jobs:
353346
354347 - name : Build + push - pktvisor (multi-arch)
355348 env :
356- IMAGE_NAME1 : orbcommunity/pktvisor
357- IMAGE_NAME2 : ghcr.io/orb-community/pktvisor
349+ IMAGE_NAME : netboxlabs/pktvisor
358350 uses : docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
359351 with :
360352 builder : ${{ steps.buildx.outputs.name }}
361353 context : .
362354 file : ./docker/Dockerfile.crashhandler
363355 platforms : linux/amd64
364- tags : ${{ env.IMAGE_NAME1 }}:${{ needs.unit-tests-linux.outputs.version_number }} , ${{ env.IMAGE_NAME1 }}:${{ env.REF_TAG }} , ${{ env.IMAGE_NAME2 }}:amd64-${{needs.unit-tests-linux.outputs.commit_hash }}
356+ tags : ${{ env.IMAGE_NAME }}:${{ needs.unit-tests-linux.outputs.version_number }} , ${{ env.IMAGE_NAME }}:${{ env.REF_TAG }}
365357 outputs : type=docker,dest=/tmp/amd64.tar
366358
367359 - name : Load image
368360 env :
369- IMAGE_NAME1 : orbcommunity/pktvisor
370- IMAGE_NAME2 : ghcr.io/orb-community/pktvisor
361+ IMAGE_NAME : netboxlabs/pktvisor
371362 run : |
372363 docker load --input /tmp/amd64.tar
373364 docker image ls -a
374- docker push ${{ env.IMAGE_NAME2 }}:amd64-${{needs.unit-tests-linux.outputs.commit_hash}}
375- docker push ${{ env.IMAGE_NAME1 }}:${{ env.REF_TAG }}
376- docker push ${{ env.IMAGE_NAME1 }}:${{ needs.unit-tests-linux.outputs.version_number }}
365+ docker push ${{ env.IMAGE_NAME }}:${{ env.REF_TAG }}
366+ docker push ${{ env.IMAGE_NAME }}:${{ needs.unit-tests-linux.outputs.version_number }}
377367
378368 build-app-image-x64 :
379369 needs : [ package-amd64 ]
@@ -439,20 +429,20 @@ jobs:
439429 - name : Login to Docker Hub
440430 uses : docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
441431 with :
442- username : ${{ secrets.ORB_DOCKERHUB_USERNAME }}
443- password : ${{ secrets.ORB_DOCKERHUB_TOKEN }}
432+ username : ${{ secrets.DOCKERHUB_USERNAME }}
433+ password : ${{ secrets.DOCKERHUB_TOKEN }}
444434
445435 - name : Build + push - pktvisor-prom-write
446436 env :
447- IMAGE_NAME : orbcommunity /pktvisor-prom-write
437+ IMAGE_NAME : netboxlabs /pktvisor-prom-write
448438 working-directory : ${{github.workspace}}/centralized_collection/prometheus/docker-grafana-agent
449439 run : |
450440 docker build . --file Dockerfile --build-arg PKTVISOR_TAG=${{ env.REF_TAG }} --tag ${{ env.IMAGE_NAME }}:${{ env.VERSION }} --tag ${{ env.IMAGE_NAME }}:${{ env.REF_TAG }}
451441 docker push -a ${{ env.IMAGE_NAME }}
452442
453443 - name : Generate AppImage
454444 env :
455- IMAGE_NAME : orbcommunity /pktvisor
445+ IMAGE_NAME : netboxlabs /pktvisor
456446 working-directory : ${{github.workspace}}/appimage
457447 run : |
458448 DEV_IMAGE="${{ env.IMAGE_NAME }}:${{ env.VERSION }}" DEV_MODE=t make pktvisor-x86_64.AppImage
@@ -514,12 +504,11 @@ jobs:
514504 echo "PRERELEASE=false" >> $GITHUB_ENV
515505 echo "DRAFT=true" >> $GITHUB_ENV
516506
517- - name : Login to GitHub Container Registry
507+ - name : Login to Docker Hub
518508 uses : docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
519509 with :
520- registry : ghcr.io
521- username : ${{ github.repository_owner }}
522- password : ${{ secrets.GITHUB_TOKEN }}
510+ username : ${{ secrets.DOCKERHUB_USERNAME }}
511+ password : ${{ secrets.DOCKERHUB_TOKEN }}
523512
524513 - name : Set up QEMU
525514 uses : docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
@@ -541,95 +530,21 @@ jobs:
541530 - name : Build + push - pktvisor (multi-arch)
542531 id : docker_build
543532 env :
544- IMAGE_NAME : ghcr.io/orb-community /pktvisor
533+ IMAGE_NAME : netboxlabs /pktvisor
545534 uses : docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
546535 with :
547536 builder : ${{ steps.buildx.outputs.name }}
548537 context : .
549538 file : ./docker/Dockerfile.crashhandler
550539 platforms : linux/arm64
551- tags : ${{ env.IMAGE_NAME }}:arm64- ${{needs.unit-tests-linux.outputs.commit_hash }}
540+ tags : ${{ env.IMAGE_NAME }}:${{ needs.unit-tests-linux.outputs.version_number }} , ${{ env.IMAGE_NAME }}:${{ env.REF_TAG }}
552541 outputs : type=docker,dest=/tmp/arm64.tar
553542
554543 - name : Load image
555544 env :
556- IMAGE_NAME : ghcr.io/orb-community /pktvisor
545+ IMAGE_NAME : netboxlabs /pktvisor
557546 run : |
558547 docker load --input /tmp/arm64.tar
559548 docker image ls -a
560- docker push ${{ env.IMAGE_NAME }}:arm64-${{needs.unit-tests-linux.outputs.commit_hash}}
561-
562- pushing-manifests :
563- needs : [ unit-tests-linux, package-amd64, package-arm64 ]
564- runs-on : ubuntu-latest
565- if : github.event_name != 'pull_request'
566- steps :
567- - name : Login to GitHub Container Registry
568- uses : docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
569- with :
570- registry : ghcr.io
571- username : ${{ github.repository_owner }}
572- password : ${{ secrets.GITHUB_TOKEN }}
573-
574- - name : Create docker manifest
575- run : |
576- docker manifest create ghcr.io/orb-community/pktvisor:latest-develop \
577- ghcr.io/orb-community/pktvisor:amd64-${{needs.unit-tests-linux.outputs.commit_hash}} \
578- ghcr.io/orb-community/pktvisor:arm64-${{needs.unit-tests-linux.outputs.commit_hash}}
579-
580- - name : Push manifest to ghcr.io
581- run : |
582- docker manifest push ghcr.io/orb-community/pktvisor:latest-develop
583-
584- - name : Install skopeo
585- run : |
586- sudo apt-get update
587- sudo apt-get install -y skopeo
588-
589- - name : Login skopeo to ghcr
590- run : |
591- sudo skopeo login -u ${{ github.repository_owner }} -p ${{ secrets.GITHUB_TOKEN }} ghcr.io
592-
593- - name : Login skopeo to dockerhub
594- run : |
595- sudo skopeo login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_TOKEN }} docker.io
596-
597- - name : Copy from ghcr.io to docker.io
598- run : |
599- sudo skopeo copy \
600- --all \
601- docker://ghcr.io/orb-community/pktvisor:latest-develop \
602- docker://docker.io/orbcommunity/pktvisor:latest-develop
603- sudo skopeo copy \
604- --all \
605- docker://ghcr.io/orb-community/pktvisor:latest-develop \
606- docker://docker.io/orbcommunity/pktvisor:develop
607- sudo skopeo copy \
608- --all \
609- docker://ghcr.io/orb-community/pktvisor:latest-develop \
610- docker://docker.io/orbcommunity/pktvisor:${{ needs.unit-tests-linux.outputs.version_number }}
611-
612-
613- - name : Delete arm64 images from ghcr.io
614- uses : bots-house/ghcr-delete-image-action@3827559c68cb4dcdf54d813ea9853be6d468d3a4 # v1.1.0
615- with :
616- owner : orb-community
617- name : pktvisor
618- token : ${{ secrets.GITHUB_TOKEN }}
619- tag : arm64-${{needs.unit-tests-linux.outputs.commit_hash}}
620-
621- - name : Delete amd64 images from ghcr.io
622- uses : bots-house/ghcr-delete-image-action@3827559c68cb4dcdf54d813ea9853be6d468d3a4 # v1.1.0
623- with :
624- owner : orb-community
625- name : pktvisor
626- token : ${{ secrets.GITHUB_TOKEN }}
627- tag : amd64-${{needs.unit-tests-linux.outputs.commit_hash}}
628-
629- - name : Delete latest-develop images from ghcr.io
630- uses : bots-house/ghcr-delete-image-action@3827559c68cb4dcdf54d813ea9853be6d468d3a4 # v1.1.0
631- with :
632- owner : orb-community
633- name : pktvisor
634- token : ${{ secrets.GITHUB_TOKEN }}
635- tag : latest-develop
549+ docker push ${{ env.IMAGE_NAME }}:${{ env.REF_TAG }}
550+ docker push ${{ env.IMAGE_NAME }}:${{ needs.unit-tests-linux.outputs.version_number }}
0 commit comments