Commit 6a091dae authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

End-to-end Test - Ryu-OpenFlow: 

- Fixed Dockerfiles
parent 38bb9c72

src/tests/ryu-openflow/Ryu.Dockerfile

+14 −7
Original line number Diff line number Diff line
@@ -14,20 +14,27 @@ 


FROM python:3.9-slim



RUN apt-get update && apt-get install -y --no-install-recommends git iproute2 && rm -rf /var/lib/apt/lists/*

# Install dependencies

RUN apt-get --yes --quiet --quiet update && \

    apt-get --yes --quiet --quiet install --no-install-recommends git iproute2 && \

    rm -rf /var/lib/apt/lists/*



RUN pip install --no-cache-dir --upgrade pip

# NOTE: Ryu 4.34 expects eventlet.wsgi.ALREADY_HANDLED, which disappears in Eventlet ≥ 0.30.3.

# Set Python to show logs as they occur

ENV PYTHONUNBUFFERED=0



RUN pip install --no-cache-dir --upgrade pip \

    && pip install --no-cache-dir "setuptools==65.5.1" "wheel" \

    && pip install --no-cache-dir --no-build-isolation \

       "git+https://github.com/faucetsdn/ryu.git@v4.34" "eventlet<0.30.3"

# Get generic Python packages

RUN python3 -m pip install --upgrade 'pip==25.2'

RUN python3 -m pip install --upgrade 'setuptools==79.0.0' 'wheel==0.45.1'

RUN python3 -m pip install --upgrade 'pip-tools==7.3.0'



# NOTE: Ryu 4.34 expects eventlet.wsgi.ALREADY_HANDLED, which disappears in Eventlet ≥ 0.30.3.

RUN pip install --no-build-isolation \

    "git+https://github.com/faucetsdn/ryu.git@v4.34" "eventlet<0.30.3"



#COPY apps/ /opt/ryu-apps/  # Copy Ryu Apps, if any

#WORKDIR /opt/ryu-apps



# --- OpenFlow & Ryu REST API ports ---

EXPOSE 6653/tcp 8080/tcp



CMD ["ryu-manager", "--verbose", "--observe-links", "ryu.app.ofctl_rest", "ryu.app.gui_topology.gui_topology"]

src/tests/ryu-openflow/Test.Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ FROM python:3.9-slim 


# Install dependencies

RUN apt-get --yes --quiet --quiet update && \

    apt-get --yes --quiet --quiet install wget g++ git && \

    apt-get --yes --quiet --quiet install --no-install-recommends wget g++ git && \

    rm -rf /var/lib/apt/lists/*



# Set Python to show logs as they occur

src/tests/ryu-openflow/mininet/Mininet.Dockerfile

+5 −4
Original line number Diff line number Diff line
@@ -19,11 +19,12 @@ FROM ubuntu:22.04 
USER root

WORKDIR /root



# Install dependencies

ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && \

    apt-get install -y --no-install-recommends iproute2 net-tools openvswitch-switch ca-certificates && \

    apt-get install -y --no-install-recommends mininet=2.3.0-1ubuntu1 && \

    apt-get autoremove -y && \

RUN apt-get --yes --quiet --quiet update && \

    apt-get install --yes --no-install-recommends iproute2 net-tools openvswitch-switch ca-certificates && \

    apt-get install --yes --no-install-recommends mininet=2.3.0-1ubuntu1 && \

    apt-get autoremove --yes && \

    apt-get clean && \

    rm -rf /var/lib/apt/lists/*