Enhance Docker setup by adding symbolic links for retrocompatibility and updating ENTRYPOINT syntax; streamline test-in-docker.sh for improved environment setup and execution flow.

Author: grongierisc

dockerfile-ci

@@ -5,14 +5,19 @@ COPY --chown=irisowner:irisowner . /irisdev/app
 
 WORKDIR /irisdev/app
 
+# map the source code of iop into iris python lib
+RUN ln -s /irisdev/app/src/iop /usr/irissys/mgr/python/iop
+# for retrocompatibility
+RUN ln -s /irisdev/app/src/grongier /usr/irissys/mgr/python/grongier
+
 ## Python stuff
-ENV IRISUSERNAME "SuperUser"
-ENV IRISPASSWORD "SYS"
-ENV IRISNAMESPACE "IRISAPP"
+ENV IRISUSERNAME="SuperUser"
+ENV IRISPASSWORD="SYS"
+ENV IRISNAMESPACE="IRISAPP"
 ENV PYTHON_PATH=/usr/irissys/bin/
-ENV LD_LIBRARY_PATH=${ISC_PACKAGE_INSTALLDIR}/bin:${LD_LIBRARY_PATH}
-ENV PATH "/home/irisowner/.local/bin:/usr/irissys/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/irisowner/bin"
+ENV LD_LIBRARY_PATH=${ISC_PACKAGE_INSTALLDIR}/bin
+ENV PATH="/home/irisowner/.local/bin:/usr/irissys/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/irisowner/bin"
 
 RUN pip install -r requirements-dev.txt
 
-ENTRYPOINT /irisdev/app/test-in-docker.sh
+ENTRYPOINT [ "/irisdev/app/test-in-docker.sh" ]

test-in-docker.sh

@@ -22,38 +22,35 @@ exit_on_error () {
 
 iris_start
 
-# run a python command
 cd src
-python3 -c "from grongier.pex import Utils; Utils.setup()"
-exit_on_error
 
-# back to workdir
-cd ..
+# print iris version
+echo "IRIS version:"
+python3 -c "import iris; print(iris.system.Version.GetVersion())"
+
+# setup the environment
+python3 -m iop --init
+exit_on_error
 
 # Unit tests
+cd ..
 python3 -m pytest
 exit_on_error
 
-# install pip
-pip install --upgrade pip
-# install main package
-pip install git+https://github.com/grongierisc/interoperability-embedded-python
-# install test dependencies
-pip install -r https://raw.githubusercontent.com/grongierisc/interoperability-embedded-python/master/requirements-dev.txt
-
 # Integration tests
-iop --migrate demo/python/reddit/settings.py
+cd src
+python3 -m iop --migrate ../demo/python/reddit/settings.py
 exit_on_error
 
-iop --default PEX.Production
+python3 -m iop --default PEX.Production
 exit_on_error
 
-iop --start PEX.Production --detach
+python3 -m iop --start PEX.Production --detach
 exit_on_error
 
-iop --log 10
+python3 -m iop --log 10
 
-iop -S
+python3 -m iop -S
 exit_on_error
 
 iris_stop