Continue to allow a relative path to be specified for the theme directory.

.dockerignore

@@ -2,5 +2,6 @@ venv
 env*
 prototypes
 support
-Dockerfile
+**/Dockerfile
 _*
+

.gitlab-ci.yml

@@ -7,7 +7,7 @@ include:
 
 variables:
   project_name: cara
-  PY_VERSION: "3.9"  # This is what we have running in OpenShift currently.
+  PY_VERSION: "3.9"
 
 
 # A full installation of CARA, tested with pytest.

app-config/cara-webservice/Dockerfile

@@ -22,6 +22,10 @@ FROM debian
 
 COPY --from=conda /opt/app /opt/app
 ENV PATH=/opt/app/bin/:$PATH
+# Make a convenient location to the installed CARA package (i.e. a directory called cara in the CWD).
+RUN CARA_INIT_FILE=$(/opt/app/bin/python -c "import cara; print(cara.__file__)") \
+ && ln -s $(dirname $(dirname ${CARA_INIT_FILE})) /opt/site-packages \
+ && ln -s /opt/site-packages/cara ./cara
 CMD [ \
   "cara-app.sh" \
 ]

app-config/openshift/deploymentconfig.yaml

@@ -201,7 +201,7 @@
                 - name: CARA_CALCULATOR_PREFIX
                   value: /calculator-cern
                 - name: CARA_THEME
-                  value: /opt/app/lib/python3.9/site-packages/cara/apps/calculator/themes/cern
+                  value: cara/apps/calculator/themes/cern
                 image: '${PROJECT_NAME}/cara-webservice'
                 ports:
                   - containerPort: 8080