Fix tests

Author: ildus

Dockerfile.tmpl

@@ -1,8 +1,15 @@
 FROM postgres:${PG_VERSION}-alpine
 
+ENV PYTHON=python${PYTHON_VERSION}
+RUN if [ "${PYTHON_VERSION}" = "2" ] ; then \
+	apk add --no-cache python py-pip; \
+	pip install six pg8000 flake8; \
+	fi
+RUN if [ "${PYTHON_VERSION}" = "3" ] ; then \
+	apk add --no-cache python3; \
+	pip3 install six pg8000 flake8; \
+	fi
 ENV LANG=C.UTF-8
-RUN apk --no-cache add python${PYTHON_VERSION} py-pip
-RUN pip install six pg8000 flake8
 
 RUN mkdir -p /pg
 VOLUME /pg
@@ -11,6 +18,7 @@ RUN chmod 755 /run.sh
 
 ADD . /pg/testgres
 WORKDIR /pg/testgres
-RUN	python setup.py install
+RUN	${PYTHON} setup.py install
 
-ENTRYPOINT su-exec postgres /run.sh
+USER postgres
+ENTRYPOINT PYTHON=${PYTHON} /run.sh

run_tests.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 cd testgres/tests
-python -m unittest test_simple
+${PYTHON} -m unittest test_simple
 flake8 --ignore=W191,F401,E501,F403 .