Fixed port and directory issues

Author: henrietteharmse

README.md

@@ -42,7 +42,7 @@ helm install oxo2 ./k8chart-local/oxo2 -n ontotools --create-namespace
 2. To access locally run: 
 ```
 kubectl port-forward deployment/oxo2-frontend 8080:8080 -n ontotools
-kubectl port-forward deployment/oxo2-backend 8081:8080 -n ontotools
+kubectl port-forward deployment/oxo2-backend 8081:8081 -n ontotools
 ``` 
 and the point your browser to http://localhost:8080. The OxO2 backend will be accessible at http://localhost:8081/
 

oxo2-backend/backend.Dockerfile

@@ -22,5 +22,5 @@ RUN chmod -R 777 /opt/oxo
 
 USER oxo
 
-EXPOSE 8080
+EXPOSE 8081
 ENTRYPOINT ["/opt/oxo/startBackend.sh"]

oxo2-dataload/dataload.Dockerfile

@@ -29,13 +29,14 @@ RUN mkdir -p /opt/solr  \
     && chown -R oxo:oxo /opt/solr
 
 
-RUN mkdir -p /tmp/data \
-    && mkdir -p /tmp/logs \
-    && chown -R oxo:oxo /tmp/data \
-    && chown -R oxo:oxo /tmp/logs
+RUN mkdir -p /mnt \
+    && mkdir -p /mnt/oxo \
+    && mkdir -p /mnt/oxo/data \
+    && mkdir -p /mnt/oxo/logs \
+    && chown -R oxo:oxo /mnt/oxo
 
 ENV PATH="${PATH}:/opt/nemo:/opt/solr" \
-    OXO2_DATA="/tmp/data" \
+    OXO2_DATA="/mnt/oxo/data" \
     SOLR_HOME="/opt/solr/server/solr" \
     SOLR_SCRIPT="/opt/solr/bin"
 
@@ -70,16 +71,17 @@ COPY --from=builder \
     /build/oxo2-dataload/oxo2-sssom2json/target/oxo2-sssom2json-1.0.0-SNAPSHOT.jar \
     /opt/oxo/oxo2-dataload/oxo2-sssom2json/target/
 
-ENV OXO2_CONFIG=/opt/oxo/config.json
+ENV OXO2_CONFIG=/mnt/oxo/config.json
 
-RUN chown -R oxo:oxo /opt/* /tmp/logs
-RUN chmod -R 777 /opt/* /tmp/logs
+RUN chown -R oxo:oxo /opt/*
+RUN chmod -R 777 /opt/* 
 
 
 USER oxo
 
 
 WORKDIR /opt/oxo/oxo2-dataload
 
-CMD ["sh", "-c", "./loadData.sh > /tmp/logs/dataload.logs"]
+# CMD ["sh", "-c", "sleep infinity"]
+CMD ["sh", "-c", "./loadData.sh > /mnt/oxo/logs/dataload.logs"]
 

oxo2-dataload/loadData.sh

@@ -10,13 +10,15 @@ rm -R $OXO2_DATA/*
 
 start_time=$(date +%s)
 echo "###################" downloadMappings...
+mkdir -p $OXO2_DATA/sssom
 $SCRIPT_DIR/downloadMappings.sh $OXO2_CONFIG $OXO2_DATA/sssom
 end_time=$(date +%s)
 elapsed=$((end_time - start_time))
 echo "Download took: ${elapsed} seconds"
 
 start_time=$(date +%s)
 echo  "###################"  sssom2json...
+mkdir -p $OXO2_CONFIG $OXO2_DATA/sssom-as-json
 $SCRIPT_DIR/sssom2json.sh $OXO2_DATA/sssom $OXO2_DATA/sssom-as-json
 end_time=$(date +%s)
 elapsed=$((end_time - start_time))
@@ -47,6 +49,7 @@ echo "Writing to Solr took: ${elapsed} seconds"
 sleep 10
 
 OXO2_INFERENCES=$OXO2_DATA/inferences
+mkdir -p $OXO2_INFERENCES
 mkdir -p $OXO2_INFERENCES/solr
 
 # Write out inferred mappings with their explanations.

oxo2-frontend/src/app/api.ts

@@ -2,7 +2,7 @@ export async function doHTTPRequest<T>(
     path: string,
     request?: RequestInit | undefined
 ): Promise<T> {
-    const BASE_URL = import.meta.env.OXO_BACKEND_URL || 'http://localhost:8080';
+    const BASE_URL = import.meta.env.OXO_BACKEND_URL || 'http://localhost:8081';
     const response: Response = await fetch(
         `${BASE_URL}${path}`,
         {