PR#354: Fix quickrun - ipsilon

Aurélien Bompard • 2 years ago

d41de1f

Makefile

file modified

+2 -2

		`@@ -129,12 +129,12 @@`
		`# 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:`

quickrun.py

file modified

+3 -3

		`@@ -130,6 +130,9 @@`
		`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 @@`
		`'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'))`

tests/containers/Dockerfile-dev

file modified

		`@@ -1,3 +1,4 @@`
		`RUN mkdir /tmp/workdir \`
		`&& chown testuser:testuser /tmp/workdir`
		`+ EXPOSE 8080`
		`ENTRYPOINT ["./quickrun.py", "--workdir", "/tmp/workdir", "--cleanup"]`