diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml index 8d9fd91e2..5eedf15e4 100644 --- a/.github/workflows/build-develop.yml +++ b/.github/workflows/build-develop.yml @@ -355,6 +355,7 @@ jobs: - name: Build + push - pktvisor (multi-arch) env: IMAGE_NAME: ns1labs/pktvisor + IMAGE_NAME1: orbcommunity/pktvisor IMAGE_NAME2: ghcr.io/orb-community/pktvisor uses: docker/build-push-action@v3 with: @@ -362,12 +363,13 @@ jobs: context: . file: ./docker/Dockerfile.crashhandler platforms: linux/amd64 - tags: ${{ env.IMAGE_NAME }}:${{ needs.unit-tests-linux.outputs.version_number }} , ${{ env.IMAGE_NAME }}:${{ env.REF_TAG }} , ${{ env.IMAGE_NAME2 }}:amd64-${{needs.unit-tests-linux.outputs.commit_hash}} + tags: ${{ env.IMAGE_NAME }}:${{ needs.unit-tests-linux.outputs.version_number }} , ${{ env.IMAGE_NAME }}:${{ env.REF_TAG }} , ${{ 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}} outputs: type=docker,dest=/tmp/amd64.tar - name: Load image env: IMAGE_NAME: ns1labs/pktvisor + IMAGE_NAME1: orbcommunity/pktvisor IMAGE_NAME2: ghcr.io/orb-community/pktvisor run: | docker load --input /tmp/amd64.tar @@ -375,6 +377,8 @@ jobs: docker push ${{ env.IMAGE_NAME2 }}:amd64-${{needs.unit-tests-linux.outputs.commit_hash}} docker push ${{ env.IMAGE_NAME }}:${{ env.REF_TAG }} docker push ${{ env.IMAGE_NAME }}:${{ needs.unit-tests-linux.outputs.version_number }} + docker push ${{ env.IMAGE_NAME1 }}:${{ env.REF_TAG }} + docker push ${{ env.IMAGE_NAME1 }}:${{ needs.unit-tests-linux.outputs.version_number }} build-app-image-x64: needs: [ package-amd64 ] @@ -1020,6 +1024,19 @@ jobs: --all \ docker://ghcr.io/orb-community/pktvisor:latest-develop \ docker://docker.io/ns1labs/pktvisor:${{ needs.unit-tests-linux.outputs.version_number }} + sudo skopeo copy \ + --all \ + docker://ghcr.io/orb-community/pktvisor:latest-develop \ + docker://docker.io/orbcommunity/pktvisor:latest-develop + sudo skopeo copy \ + --all \ + docker://ghcr.io/orb-community/pktvisor:latest-develop \ + docker://docker.io/orbcommunity/pktvisor:develop + sudo skopeo copy \ + --all \ + docker://ghcr.io/orb-community/pktvisor:latest-develop \ + docker://docker.io/orbcommunity/pktvisor:${{ needs.unit-tests-linux.outputs.version_number }} + - name: Delete arm64 images from ghcr.io uses: bots-house/ghcr-delete-image-action@v1.0.0 diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 1a555836b..6059e09ec 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -988,6 +988,10 @@ jobs: --all \ docker://ghcr.io/orb-community/pktvisor:latest \ docker://docker.io/ns1labs/pktvisor:latest + sudo skopeo copy \ + --all \ + docker://ghcr.io/orb-community/pktvisor:latest \ + docker://docker.io/orbcommunity/pktvisor:latest - name: Copy release version from ghcr.io to docker.io run: | @@ -995,3 +999,7 @@ jobs: --all \ docker://ghcr.io/orb-community/pktvisor:latest \ docker://docker.io/ns1labs/pktvisor:${{ needs.package-amd64.outputs.release_version }} + sudo skopeo copy \ + --all \ + docker://ghcr.io/orb-community/pktvisor:latest \ + docker://docker.io/orbcommunity/pktvisor:${{ needs.package-amd64.outputs.release_version }} diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml index 4e8b4e123..13a40d241 100644 --- a/.github/workflows/debug_build.yml +++ b/.github/workflows/debug_build.yml @@ -191,6 +191,8 @@ jobs: - name: Build, push debug image + crashhandler env: IMAGE_NAME: ns1labs/pktvisor + IMAGE_NAME1: orbcommunity/pktvisor run: | - docker build . --file docker/Dockerfile.crashhandler --tag ${{ env.IMAGE_NAME }}:${{ env.REF_TAG }} + docker build . --file docker/Dockerfile.crashhandler --tag ${{ env.IMAGE_NAME }}:${{ env.REF_TAG }} --tag ${{ env.IMAGE_NAME1 }}:${{ env.REF_TAG }} docker push -a ${{ env.IMAGE_NAME }} + docker push -a ${{ env.IMAGE_NAME1 }} diff --git a/.github/workflows/static_build.yml b/.github/workflows/static_build.yml deleted file mode 100644 index a965a25c9..000000000 --- a/.github/workflows/static_build.yml +++ /dev/null @@ -1,129 +0,0 @@ -name: Static Build - -on: - workflow_dispatch: - pull_request: - branches: - - develop - - release - push: - branches: - - develop - - release - -env: - # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) - BUILD_TYPE: Release - CTEST_OUTPUT_ON_FAILURE: 1 - -jobs: - build: - # The CMake configure and build commands are platform agnostic and should work equally - # well on Windows or Mac. You can convert this to a matrix build if you need - # cross-platform coverage. - # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix - strategy: - matrix: - os: [ ubuntu-latest ] - runs-on: ${{ matrix.os }} - - steps: - - uses: actions/checkout@v3 - - - name: Build and test static base - run: | - docker build -f docker/Dockerfile.static-base -t ns1labs/static-base . - - - name: Get branch name - shell: bash - run: echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/} | tr / -)" >> $GITHUB_ENV - - - name: Debug branch name - run: echo ${{ env.BRANCH_NAME }} - - - name: Get VERSION - run: | - echo "VERSION=`docker run --rm -a stdout --entrypoint cat ns1labs/static-base VERSION`" >> $GITHUB_ENV - - - name: Debug version - run: echo ${{ env.VERSION }} - - - name: Generate ref tag (master) - if: github.event_name != 'pull_request' && env.BRANCH_NAME == 'master' - run: | - echo "REF_TAG=latest" >> $GITHUB_ENV - - - name: Generate ref tag (develop) - if: github.event_name != 'pull_request' && env.BRANCH_NAME == 'develop' - run: | - echo "REF_TAG=latest-develop" >> $GITHUB_ENV - - - name: Generate ref tag (release candidate) - if: github.event_name != 'pull_request' && env.BRANCH_NAME == 'release' - run: | - echo "REF_TAG=latest-rc" >> $GITHUB_ENV - - - name: Debug ref tag - if: github.event_name != 'pull_request' - run: echo ${{ env.REF_TAG }} - - - name: Login to Docker Hub - if: github.event_name != 'pull_request' - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push static pktvisord container - if: github.event_name != 'pull_request' - env: - BASE_BINARY: pktvisord - IMAGE_NAME: ns1labs/pktvisord - run: | - docker build -f docker/Dockerfile.${{ env.BASE_BINARY }}-static -t ${{ env.IMAGE_NAME }}:${{ env.REF_TAG }} -t ${{ env.IMAGE_NAME }}:${{ env.VERSION }} . - docker push -a ${{ env.IMAGE_NAME }} - echo "CONT_ID=$(docker create --name ${{ env.BASE_BINARY }}-slim-tmp ${{ env.IMAGE_NAME }}:${{ env.REF_TAG }})" >> $GITHUB_ENV - - - name: Extract static pktvisord asset - if: github.event_name != 'pull_request' - env: - BASE_BINARY: pktvisord - IMAGE_NAME: ns1labs/pktvisord - run: | - docker cp ${{ env.CONT_ID }}:/${{ env.BASE_BINARY }} ${{github.workspace}}/${{ env.BASE_BINARY }}-linux-x86_64-${{ env.VERSION }} - - - name: Upload pktvisord artifact - if: github.event_name != 'pull_request' - env: - BINARY_NAME: pktvisord-linux-x86_64-${{ env.VERSION }} - uses: actions/upload-artifact@v2 - with: - name: ${{ env.BINARY_NAME }} - path: ${{github.workspace}}/${{ env.BINARY_NAME }} - - - name: Build and push static pktvisor-reader container - if: github.event_name != 'pull_request' - env: - BASE_BINARY: pktvisor-reader - IMAGE_NAME: ns1labs/pktvisor-reader - run: | - docker build -f docker/Dockerfile.${{ env.BASE_BINARY }}-static -t ${{ env.IMAGE_NAME }}:${{ env.REF_TAG }} -t ${{ env.IMAGE_NAME }}:${{ env.VERSION }} . - docker push -a ${{ env.IMAGE_NAME }} - echo "CONT_ID=$(docker create --name ${{ env.BASE_BINARY }}-slim-tmp ${{ env.IMAGE_NAME }}:${{ env.REF_TAG }})" >> $GITHUB_ENV - - - name: Extract static pktvisor-reader asset - if: github.event_name != 'pull_request' - env: - BASE_BINARY: pktvisor-reader - IMAGE_NAME: ns1labs/pktvisor-reader - run: | - docker cp ${{ env.CONT_ID }}:/${{ env.BASE_BINARY }} ${{github.workspace}}/${{ env.BASE_BINARY }}-linux-x86_64-${{ env.VERSION }} - - - name: Upload pktvisor-reader artifact - if: github.event_name != 'pull_request' - env: - BINARY_NAME: pktvisor-reader-linux-x86_64-${{ env.VERSION }} - uses: actions/upload-artifact@v2 - with: - name: ${{ env.BINARY_NAME }} - path: ${{github.workspace}}/${{ env.BINARY_NAME }}