Skip to content

Remove unnecessary OUI.txt downloads #217

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
jboddey merged 2 commits into from
Jan 4, 2024
Merged

Remove unnecessary OUI.txt downloads #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af4724d
Remove oui.txt downloads
jboddey Jan 2, 2024
ed0a0e4
Install wget
jboddey Jan 2, 2024
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
3 changes: 0 additions & 3 deletions modules/network/dhcp-1/dhcp-1.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ RUN apt-get update --fix-missing
# Install all necessary packages
RUN apt-get install -y wget

# Update the oui.txt file from ieee
RUN wget http://standards-oui.ieee.org/oui.txt -P /usr/local/etc/

# Install dhcp server
RUN apt-get install -y isc-dhcp-server radvd systemd

Expand Down
5 changes: 1 addition & 4 deletions modules/network/dhcp-2/dhcp-2.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,12 @@ FROM test-run/base:latest
ARG MODULE_NAME=dhcp-2
ARG MODULE_DIR=modules/network/$MODULE_NAME

#Update and get all additional requirements not contained in the base image
# Update and get all additional requirements not contained in the base image
RUN apt-get update --fix-missing

# Install all necessary packages
RUN apt-get install -y wget

# Update the oui.txt file from ieee
RUN wget http://standards-oui.ieee.org/oui.txt -P /usr/local/etc/

# Install dhcp server
RUN apt-get install -y isc-dhcp-server radvd systemd

Expand Down
5 changes: 4 additions & 1 deletion modules/test/base/base.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ARG COMMON_DIR=framework/python/src/common
RUN apt-get update

# Install common software
RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq net-tools iputils-ping tzdata tcpdump iproute2 jq python3 python3-pip dos2unix nmap --fix-missing
RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq net-tools iputils-ping tzdata tcpdump iproute2 jq python3 python3-pip dos2unix nmap wget --fix-missing

# Install common python modules
COPY $COMMON_DIR/ /testrun/python/src/common
Expand Down Expand Up @@ -50,5 +50,8 @@ ARG CONTAINER_PROTO_DIR=testrun/python/src/grpc_server/proto
COPY $NET_MODULE_DIR/dhcp-1/$NET_MODULE_PROTO_DIR $CONTAINER_PROTO_DIR/dhcp1/
COPY $NET_MODULE_DIR/dhcp-2/$NET_MODULE_PROTO_DIR $CONTAINER_PROTO_DIR/dhcp2/

# Update the oui.txt file from ieee
RUN wget https://standards-oui.ieee.org/oui/oui.txt -P /usr/local/etc/

# Start the test module
ENTRYPOINT [ "/testrun/bin/start" ]
7 changes: 2 additions & 5 deletions modules/test/conn/conn.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,10 @@ ARG GRPC_PROTO_FILE="grpc.proto"
# Install all necessary packages
RUN apt-get install -y wget

# Update the oui.txt file from ieee
RUN wget http://standards-oui.ieee.org/oui.txt -P /usr/local/etc/

#Load the requirements file
# Load the requirements file
COPY $MODULE_DIR/python/requirements.txt /testrun/python

#Install all python requirements for the module
# Install all python requirements for the module
RUN pip3 install -r /testrun/python/requirements.txt

# Copy over all configuration files
Expand Down