Remove old docker hub organization (ns1labs) (#658)

netboxlabs · Apr 5, 2023 · 117671d · 117671d
1 parent 43d1f0d
commit 117671d
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 103 deletions.
diff --git a/.github/actions/build-go/Dockerfile b/.github/actions/build-go/Dockerfile
@@ -1,7 +1,7 @@
 FROM golang:latest
 
 LABEL author="Everton Haise Taques <[email protected]>"
-LABEL maintainer="NS1 Labs"
+LABEL maintainer="netboxlabs"
 LABEL version="1.0.0"
 
 COPY ./entrypoint.sh /entrypoint.sh

diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml
@@ -332,8 +332,8 @@ jobs:
       - name: Login to Docker Hub
         uses: docker/login-action@v1
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
+          password: ${{ secrets.ORB_DOCKERHUB_TOKEN }}
 
       - name: Replace token
         run: |
@@ -354,7 +354,6 @@ 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
@@ -363,20 +362,17 @@ 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_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}}
+          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}}
           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
           docker image ls -a
           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 }}
 
@@ -421,8 +417,8 @@ jobs:
       - name: Login to Docker Hub
         uses: docker/login-action@v1
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
+          password: ${{ secrets.ORB_DOCKERHUB_TOKEN }}
 
       - name: Build + push - pktvisor-cli
         env:
@@ -1012,18 +1008,6 @@ jobs:
 
       - name: Copy from ghcr.io to docker.io
         run: |
-          sudo skopeo copy \
-          --all \
-          docker://ghcr.io/orb-community/pktvisor:latest-develop \
-          docker://docker.io/ns1labs/pktvisor:latest-develop
-          sudo skopeo copy \
-          --all \
-          docker://ghcr.io/orb-community/pktvisor:latest-develop \
-          docker://docker.io/ns1labs/pktvisor:develop
-          sudo skopeo copy \
-          --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 \

diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -980,25 +980,17 @@ jobs:
 
       - name: Login skopeo to dockerhub
         run: |
-          sudo skopeo login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_TOKEN }} docker.io
+          sudo skopeo login -u ${{ secrets.ORB_DOCKERHUB_USERNAME }} -p ${{ secrets.ORB_DOCKERHUB_TOKEN }} docker.io
 
       - name: Copy latest from ghcr.io to docker.io
         run: |
-          sudo skopeo copy \
-          --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: |
-          sudo skopeo copy \
-          --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 \

diff --git a/centralized_collection/prometheus/docker-grafana-agent/Dockerfile b/centralized_collection/prometheus/docker-grafana-agent/Dockerfile
@@ -1,7 +1,7 @@
 ARG PKTVISOR_TAG=latest
 FROM grafana/agent:latest as agent
 
-FROM ns1labs/pktvisor:${PKTVISOR_TAG}
+FROM orbcommunity/pktvisor:${PKTVISOR_TAG}
 
 COPY --from=agent /bin/agent /usr/local/bin/agent
 

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -50,8 +50,8 @@ RUN \
 
 #create dir and download geo db
 RUN mkdir /geo-db
-RUN cd /geo-db && wget https://github.com/ns1labs/geo-asn-database/raw/main/asn.mmdb.gz
-RUN cd /geo-db && wget https://github.com/ns1labs/geo-asn-database/raw/main/city.mmdb.gz
+RUN cd /geo-db && wget https://github.com/orb-community/geo-asn-database/raw/main/asn.mmdb.gz
+RUN cd /geo-db && wget https://github.com/orb-community/geo-asn-database/raw/main/city.mmdb.gz
 
 RUN mkdir /iana
 COPY --from=cppbuild /pktvisor-src/src/tests/fixtures/pktvisor-port-service-names.csv /iana/custom-iana.csv

diff --git a/docker/Dockerfile.clang-toolchain b/docker/Dockerfile.clang-toolchain
diff --git a/docker/Dockerfile.crashhandler b/docker/Dockerfile.crashhandler
@@ -18,8 +18,8 @@ COPY ./docker/run.sh /run.sh
 
 #create dir and download geo db
 RUN mkdir /geo-db
-RUN cd /geo-db && wget https://github.com/ns1labs/geo-asn-database/raw/main/asn.mmdb.gz
-RUN cd /geo-db && wget https://github.com/ns1labs/geo-asn-database/raw/main/city.mmdb.gz
+RUN cd /geo-db && wget https://github.com/orb-community/geo-asn-database/raw/main/asn.mmdb.gz
+RUN cd /geo-db && wget https://github.com/orb-community/geo-asn-database/raw/main/city.mmdb.gz
 
 #create dir and setup iana csv
 RUN mkdir /iana

diff --git a/docker/Dockerfile.pktvisor-reader-static b/docker/Dockerfile.pktvisor-reader-static
diff --git a/docker/Dockerfile.pktvisord-static b/docker/Dockerfile.pktvisord-static
diff --git a/docker/Dockerfile.static-base b/docker/Dockerfile.static-base
diff --git a/docker/entry-cp.sh b/docker/entry-cp.sh
@@ -14,9 +14,9 @@ trap trapeze SIGINT
 
 if [ $# -eq 0 ]; then
   echo "No arguments provided: specify either 'pktvisor-cli', 'pktvisor-reader' or 'pktvisord'. Try:"
-  echo "docker run ns1labs/pktvisor pktvisor-cli -h"
-  echo "docker run ns1labs/pktvisor pktvisor-reader --help"
-  echo "docker run ns1labs/pktvisor pktvisord --help"
+  echo "docker run orbcommunity/pktvisor pktvisor-cli -h"
+  echo "docker run orbcommunity/pktvisor pktvisor-reader --help"
+  echo "docker run orbcommunity/pktvisor pktvisord --help"
   exit 1
 fi
 

diff --git a/docker/entry.sh b/docker/entry.sh
@@ -7,9 +7,9 @@ export PATH=$PATH:/usr/local/bin/:/usr/local/sbin/
 
 if [ $# -eq 0 ]; then
   echo "No arguments provided: specify either 'pktvisor-cli', 'pktvisor-reader' or 'pktvisord'. Try:"
-  echo "docker run ns1labs/pktvisor pktvisor-cli -h"
-  echo "docker run ns1labs/pktvisor pktvisor-reader --help"
-  echo "docker run ns1labs/pktvisor pktvisord --help"
+  echo "docker run orbcommunity/pktvisor pktvisor-cli -h"
+  echo "docker run orbcommunity/pktvisor pktvisor-reader --help"
+  echo "docker run orbcommunity/pktvisor pktvisord --help"
   exit 1
 fi