Skip to content

Remove old docker hub organization (ns1labs) #658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Apr 5, 2023
Merged

Remove old docker hub organization (ns1labs) #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a19d25b
remove-old-org
etaques Apr 3, 2023
ad5e570
remove old org
etaques Apr 3, 2023
380afc4
Update Dockerfile
etaques Apr 5, 2023
bd64691
Update Dockerfile
etaques Apr 5, 2023
f51c4eb
Update entry-cp.sh
etaques Apr 5, 2023
b9e5bf8
Update entry.sh
etaques Apr 5, 2023
f4db97c
Delete Dockerfile.clang-toolchain
etaques Apr 5, 2023
cd6201a
Delete Dockerfile.pktvisord-static
etaques Apr 5, 2023
3194a30
Delete Dockerfile.pktvisor-reader-static
etaques Apr 5, 2023
28c5da0
Delete Dockerfile.static-base
etaques Apr 5, 2023
2be869e
Update Dockerfile.crashhandler
etaques Apr 5, 2023
4f85c15
Update Dockerfile
etaques Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/build-go/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM golang:latest

LABEL author="Everton Haise Taques <everton.taques@encora.com>"
LABEL maintainer="NS1 Labs"
LABEL maintainer="netboxlabs"
LABEL version="1.0.0"

COPY ./entrypoint.sh /entrypoint.sh
Expand Down
26 changes: 5 additions & 21 deletions .github/workflows/build-develop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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
Expand All @@ -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 }}

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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 \
Expand Down
10 changes: 1 addition & 9 deletions .github/workflows/build-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion centralized_collection/prometheus/docker-grafana-agent/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 0 additions & 16 deletions docker/Dockerfile.clang-toolchain
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions docker/Dockerfile.crashhandler
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions docker/Dockerfile.pktvisor-reader-static
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions docker/Dockerfile.pktvisord-static
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions docker/Dockerfile.static-base
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions docker/entry-cp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions docker/entry.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down