Update docker - due to the composer changes of the web UI

pkiraly · Nov 13, 2023 · 1dd3df3 · 1dd3df3
1 parent 8e8c061
commit 1dd3df3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -92,15 +92,23 @@ RUN cd /opt \
  && echo dir=/opt/qa-catalogue/marc/_output > /var/www/html/qa-catalogue/configuration.cnf \
  # && cp /var/www/html/qa-catalogue/configuration.js.template /var/www/html/qa-catalogue/configuration.js \
  && touch /var/www/html/qa-catalogue/selected-facets.js \
- && mkdir /var/www/html/qa-catalogue/cache \
+ && if [ ! -d /var/www/html/qa-catalogue/cache ]; then \
+      mkdir /var/www/html/qa-catalogue/cache \
+    fi \
  && chown www-data:www-data -R /var/www/html/qa-catalogue/cache \
  && chmod g+w -R /var/www/html/qa-catalogue/cache \
  && touch cache/selected-facets.js \
- && mkdir _smarty \
+ && if [ ! -d _smarty ]; then \
+      mkdir _smarty \
+    fi \
  && chgrp www-data -R _smarty \
  && chmod g+w -R _smarty \
- && mkdir /var/www/html/qa-catalogue/libs \
- && mkdir /var/www/html/qa-catalogue/images \
+ && if [ ! -d /var/www/html/qa-catalogue/libs ]; then \
+      mkdir /var/www/html/qa-catalogue/libs \
+    fi \
+ && if [ ! -d /var/www/html/qa-catalogue/images ]; then \
+        mkdir /var/www/html/qa-catalogue/images \
+    fi \
 # && cd /var/www/html/qa-catalogue/libs/ \
 # && curl -s -L https://github.com/smarty-php/smarty/archive/v${SMARTY_VERSION}.zip --output v$SMARTY_VERSION.zip \
 # && unzip -q v${SMARTY_VERSION}.zip \

diff --git a/catalogues/nls.sh b/catalogues/nls.sh
@@ -3,7 +3,7 @@
 . ./setdir.sh
 NAME=nls
 MARC_DIR=${BASE_INPUT_DIR}/nls
-TYPE_PARAMS="--marcxml --emptyLargeCollectors --indexWithTokenizedField"
+TYPE_PARAMS="--marcxml --emptyLargeCollectors --indexWithTokenizedField --indexFieldCounts"
 MASK=NBS_v2_validated_marcxml.xml.gz
 
 . ./common-script
diff --git a/catalogues/yale.sh b/catalogues/yale.sh
@@ -4,7 +4,7 @@
 
 NAME=yale
 MARC_DIR=${BASE_INPUT_DIR}/yale/2023-11-05
-TYPE_PARAMS="--emptyLargeCollectors --indexWithTokenizedField"
+TYPE_PARAMS="--emptyLargeCollectors --indexWithTokenizedField --indexFieldCounts"
 MASK=bib_*.mrc
 
 . ./common-script
diff --git a/pom.xml b/pom.xml
@@ -146,13 +146,6 @@
 			<groupId>org.apache.solr</groupId>
 			<version>9.4.0</version>
 		</dependency>
-		<!--
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-client</artifactId>
-			<version>12.0.3</version>
-		</dependency>
-		-->
 		<dependency>
 			<groupId>org.reflections</groupId>
 			<artifactId>reflections</artifactId>