From d41de1f6cb2d2242065b28b0782393e7742d7e54 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Jun 01 2021 07:49:06 +0000
Subject: Fix quickrun


Signed-off-by: Aurélien Bompard <aurelien@bompard.org>

---

diff --git a/Makefile b/Makefile
index f992a75..5c16833 100644
--- a/Makefile
+++ b/Makefile
@@ -129,12 +129,12 @@ releaserpms: rpmroot rpmdistdir sdist
 # Running within containers
 container-quickrun:
 	echo "Building quickrun container ..."
-	(cat tests/containers/Dockerfile-base tests/containers/Dockerfile-dev tests/containers/Dockerfile-fedora tests/containers/Dockerfile-rpm; echo "USER testuser") | sed -e 's/BASE/fedora:latest/' | docker build -f - -t ipsilon-quickrun -
+	(cat tests/containers/Dockerfile-base tests/containers/Dockerfile-dev tests/containers/Dockerfile-fedora tests/containers/Dockerfile-rpm tests/containers/Dockerfile-rpm-py3; echo "USER testuser") | sed -e 's/BASE/fedora:latest/' | docker build -f - -t ipsilon-quickrun .
 	echo "quickrun container built"
 
 quickrun: container-quickrun
 	echo "Starting Quickrun ..."
-	docker run -v `pwd`:/code:z -t --rm -it ipsilon-quickrun
+	docker run -v `pwd`:/code:z -t --rm -it -p 8080 ipsilon-quickrun
 
 # Testing within containers
 container-centos7:
diff --git a/quickrun.py b/quickrun.py
index 0235955..7f5f013 100755
--- a/quickrun.py
+++ b/quickrun.py
@@ -130,6 +130,9 @@ if __name__ == '__main__':
     penv.update(os.environ)
     penv['PYTHONPATH'] = os.getcwd()
 
+    if args['cleanup']:
+        shutil.rmtree(args['workdir'])
+
     if not os.path.exists(args['workdir']):
         conf = config(args['workdir'])
         init(args['workdir'])
@@ -140,9 +143,6 @@ if __name__ == '__main__':
                                'ipsilon/install/ipsilon-upgrade-database')
     exe = os.path.join(os.getcwd(), 'ipsilon/ipsilon')
 
-    if args['cleanup']:
-        shutil.rmtree(args['workdir'])
-
     if not os.path.exists(os.path.join(args['workdir'], 'themes')):
         os.symlink(os.path.join(os.getcwd(), 'themes'),
                    os.path.join(args['workdir'], 'themes'))
diff --git a/tests/containers/Dockerfile-dev b/tests/containers/Dockerfile-dev
index 43a4f17..415a0d1 100644
--- a/tests/containers/Dockerfile-dev
+++ b/tests/containers/Dockerfile-dev
@@ -1,3 +1,4 @@
 RUN mkdir /tmp/workdir \
     && chown testuser:testuser /tmp/workdir
+EXPOSE 8080
 ENTRYPOINT ["./quickrun.py", "--workdir", "/tmp/workdir", "--cleanup"]