From 38c73bfa3063bc181cc884b2baefe417dc451260 Mon Sep 17 00:00:00 2001
From: nrybowski <nicolas.rybowski@uclouvain.be>
Date: Tue, 23 May 2023 23:02:21 +0000
Subject: [PATCH] Use new KVM base env

See https://github.com/UCL-INGI/INGInious/pull/949.
---
 grading/ipmininet/Dockerfile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/grading/ipmininet/Dockerfile b/grading/ipmininet/Dockerfile
index ae613a15..bc3990e6 100644
--- a/grading/ipmininet/Dockerfile
+++ b/grading/ipmininet/Dockerfile
@@ -1,5 +1,6 @@
 ARG   VERSION=latest
-FROM  ingi/inginious-c-base:${VERSION}
+ARG	REGISTRY
+FROM  ${REGISTRY}/inginious/env-kvm:${VERSION}
 LABEL org.inginious.grading.name="ipmininet"
 
 # Install mininet deps
@@ -10,7 +11,7 @@ RUN	dnf config-manager --set-enabled powertools &&\
 # Install mininet
 WORKDIR /opt
 RUN 	git clone https://github.com/mininet/mininet &&\
-	git -C mininet checkout 2.3.1b1 &&\
+	git -C mininet checkout 2.3.1b4 &&\
 	ln -s /bin/python3 /bin/python &&\
 	rm mininet/examples/miniedit.py &&\
 	make -C mininet mnexec &&\
@@ -22,8 +23,8 @@ RUN 	git clone https://github.com/mininet/mininet &&\
 RUN	git clone https://github.com/cnp3/ipmininet.git &&\
 	git -C ipmininet checkout 72cefde536ca02c650875d4b14d93899824af668 &&\
 	sed -i -e 's/^[ ]*setup_mininet_dep()/\t#setup_mininet_dep()/g' ipmininet/setup.py &&\
-	pip3 install ipmininet/ &&\
-	python -m ipmininet.install -q
+	sed -i -e 's/mininet=={ver}/mininet>={ver}/g' ipmininet/setup.py &&\
+	pip3 install ipmininet/
+	#python -m ipmininet.install -q
 
-RUN 	dnf remove -y git gcc make &&\
-	dnf autoremove -y
+WORKDIR /