Update docker building process pkiraly#267

Author: pkiraly

Dockerfile

@@ -4,7 +4,8 @@ LABEL maintainer="Péter Király <[email protected]>, Ákos Takács <rimelek@rimel
 
 LABEL description="QA catalogue - a metadata quality assessment tool for MARC based library catalogues."
 
-ARG QA_CATALOGUE_VERSION=0.6.0
+ARG QA_CATALOGUE_VERSION=0.7.0-rc1
+ARG QA_CATALOGUE_WEB_VERSION=0.7.0-rc1
 ARG DEBIAN_FRONTEND=noninteractive
 ARG SMARTY_VERSION=3.1.44
 ARG SOLR_VERSION=8.11.1
@@ -27,6 +28,7 @@ RUN apt-get update \
       nano \
       jq \
       curl \
+      wget \
       openssl \
       # install Java
       openjdk-11-jre-headless \
@@ -50,37 +52,47 @@ RUN cd /opt \
  && mv metadata-qa-marc-${QA_CATALOGUE_VERSION} metadata-qa-marc \
  && mv /opt/metadata-qa-marc/setdir.sh.template /opt/metadata-qa-marc/setdir.sh \
  && mkdir -p /opt/metadata-qa-marc/marc \
- && sed -i.bak 's,BASE_INPUT_DIR=your/path,BASE_INPUT_DIR=/opt/metadata-qa-marc/marc,' /opt/metadata-qa-marc/setdir.sh \
- && sed -i.bak 's,BASE_OUTPUT_DIR=your/path,BASE_OUTPUT_DIR=/opt/metadata-qa-marc/marc/_output,' /opt/metadata-qa-marc/setdir.sh \
+ && sed -i.bak 's,BASE_INPUT_DIR=./input,BASE_INPUT_DIR=/opt/metadata-qa-marc/marc,' /opt/metadata-qa-marc/setdir.sh \
+ && sed -i.bak 's,BASE_OUTPUT_DIR=./output,BASE_OUTPUT_DIR=/opt/metadata-qa-marc/marc/_output,' /opt/metadata-qa-marc/setdir.sh \
  # install web application
  && apt-get update \
  && apt-get install -y --no-install-recommends \
       apache2 \
       php \
       php-sqlite3 \
+      php-curl \
       unzip \
+      composer \
  && rm -rf /var/lib/apt/lists/* \
  && cd /var/www/html/ \
- && curl -s -L https://github.com/pkiraly/metadata-qa-marc-web/archive/refs/heads/main.zip --output master.zip \
-# && curl -s -L https://github.com/pkiraly/metadata-qa-marc-web/archive/0.4.zip --output master.zip \
+# && curl -s -L https://github.com/pkiraly/metadata-qa-marc-web/archive/refs/heads/main.zip --output master.zip \
+# && curl -s -L https://github.com/pkiraly/metadata-qa-marc-web/archive/${QA_CATALOGUE_VERSION}.zip --output master.zip \
+ && curl -s -L https://github.com/pkiraly/metadata-qa-marc-web/archive/refs/tags/v${QA_CATALOGUE_WEB_VERSION}.zip --output master.zip \
+ && ls -la \
  && unzip -q master.zip \
  && rm master.zip \
 # && mv metadata-qa-marc-web-0.4 metadata-qa \
- && mv metadata-qa-marc-web-main metadata-qa \
+ && mv metadata-qa-marc-web-${QA_CATALOGUE_WEB_VERSION} metadata-qa \
+ && cd metadata-qa \
+ && composer install \
  && echo dir=/opt/metadata-qa-marc/marc/_output > /var/www/html/metadata-qa/configuration.cnf \
  # && cp /var/www/html/metadata-qa/configuration.js.template /var/www/html/metadata-qa/configuration.js \
  && touch /var/www/html/metadata-qa/selected-facets.js \
  && mkdir /var/www/html/metadata-qa/cache \
  && chown www-data:www-data -R /var/www/html/metadata-qa/cache \
  && chmod g+w -R /var/www/html/metadata-qa/cache \
+ && touch cache/selected-facets.js \
+ && mkdir _smarty \
+ && chgrp www-data -R _smarty \
+ && chmod g+w -R _smarty \
  && mkdir /var/www/html/metadata-qa/libs \
  && mkdir /var/www/html/metadata-qa/images \
- && cd /var/www/html/metadata-qa/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 \
- && rm v${SMARTY_VERSION}.zip \
- && mkdir -p /var/www/html/metadata-qa/libs/_smarty/templates_c \
- && chmod a+w -R /var/www/html/metadata-qa/libs/_smarty/templates_c/ \
+# && cd /var/www/html/metadata-qa/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 \
+# && rm v${SMARTY_VERSION}.zip \
+# && mkdir -p /var/www/html/metadata-qa/libs/_smarty/templates_c \
+# && chmod a+w -R /var/www/html/metadata-qa/libs/_smarty/templates_c/ \
  && sed -i.bak 's,</VirtualHost>,        RedirectMatch ^/$ /metadata-qa/\n        <Directory /var/www/html/metadata-qa>\n                Options Indexes FollowSymLinks MultiViews\n                AllowOverride All\n                Order allow\,deny\n                allow from all\n                DirectoryIndex index.php index.html\n        </Directory>\n</VirtualHost>,' /etc/apache2/sites-available/000-default.conf \
  && echo "\nWEB_DIR=/var/www/html/metadata-qa/\n" >> /opt/metadata-qa-marc/common-variables
 

common-variables

@@ -1,3 +1,3 @@
-VERSION=0.7.0-SNAPSHOT
+VERSION=0.7.0-rc1
 JAR=target/metadata-qa-marc-${VERSION}-jar-with-dependencies.jar
 DIR=.

pom.xml

@@ -5,7 +5,7 @@
 	<groupId>de.gwdg.metadataqa</groupId>
 	<artifactId>metadata-qa-marc</artifactId>
 	<packaging>jar</packaging>
-	<version>0.7.0-SNAPSHOT</version>
+	<version>0.7.0-rc1</version>
 	<name>Quality assessment for MARC</name>
 	<description>
 		A metadata quality assessment framework for MARC21 records.

src/test/java/de/gwdg/metadataqa/marc/cli/CompletenessTest.java

@@ -313,7 +313,7 @@ public void completeness_pica_groupBy_file() throws Exception {
         assertTrue(line.contains("\"replacementInControlFields\":null,"));
         assertTrue(line.contains("\"marc21\":false,"));
         assertTrue(line.contains("\"mqaf.version\":\"1.0.0-SNAPSHOT\","));
-        assertTrue(line.contains("\"qa-catalogue.version\":\"0.7.0-SNAPSHOT\"}"));
+        assertTrue(line.contains("\"qa-catalogue.version\":\"0.7.0-rc1\"}"));
 
       } else if (outputFile.equals("libraries.csv")) {
         output = new File(outputDir, outputFile);

src/test/java/de/gwdg/metadataqa/marc/cli/ValidatorCliTest.java

@@ -244,7 +244,7 @@ public void validate_pica_groupBy() throws Exception {
         assertTrue(line.contains("\"replacementInControlFields\":null,"));
         assertTrue(line.contains("\"marc21\":false,"));
         assertTrue(line.contains("\"mqaf.version\":\"1.0.0-SNAPSHOT\","));
-        assertTrue(line.contains("\"qa-catalogue.version\":\"0.7.0-SNAPSHOT\"}"));
+        assertTrue(line.contains("\"qa-catalogue.version\":\"0.7.0-rc1\"}"));
 
       } else {
         fail("Untested output file: " + outputFile);

src/test/java/de/gwdg/metadataqa/marc/cli/VersionTest.java

@@ -6,7 +6,7 @@
 
 public class VersionTest {
 
-  private static final String VERSION = "0.7.0-SNAPSHOT";
+  private static final String VERSION = "0.7.0-rc1";
 
   @Test
   public void getVersion() {