issue pkiraly#117: update Docker 0.5.0

hbz · Mar 28, 2022 · 49091d4 · 49091d4
1 parent 4209163
commit 49091d4
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 57 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,4 @@
+scripts/downloaders
+scripts/record-patterns/
+scripts/sqlite/import-issue-details.php
+scripts/sqlite/import-issue-summary.php
diff --git a/Dockerfile b/Dockerfile
@@ -5,6 +5,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 DEBIAN_FRONTEND=noninteractive
+ARG SMARTY_VERSION=3.1.44
+ARG SOLR_VERSION=8.11.1
 
 # install R
 ENV TZ=Etc/UTC
@@ -39,43 +41,18 @@ RUN apt-get update \
  && rm -rf /var/lib/apt/lists/*
 
 # install metadata-qa-marc
-RUN mkdir -p /opt/metadata-qa-marc/scripts \
- && mkdir -p /opt/metadata-qa-marc/target
-
-COPY target/metadata-qa-marc-0.5-jar-with-dependencies.jar /opt/metadata-qa-marc/target/
-COPY scripts /opt/metadata-qa-marc/scripts/
-COPY setdir.sh.template /opt/metadata-qa-marc/setdir.sh
-
-# copy common scripts
-COPY common-variables \
-     common-script \
-     metadata-qa.sh \
-     LICENSE \
-     README.md /opt/metadata-qa-marc/
-
-# copy analysis scripts
-COPY validator \
-     prepare-solr \
-     index \
-     solr-functions \
-     completeness \
-     classifications \
-     authorities \
-     tt-completeness \
-     shelf-ready-completeness \
-     serial-score \
-     formatter \
-     functional-analysis \
-     network-analysis /opt/metadata-qa-marc/
-
-RUN mkdir -p /opt/metadata-qa-marc/marc \
+COPY target/metadata-qa-marc-0.5-release.zip /opt
+
+RUN cd /opt \
+ && unzip metadata-qa-marc-0.5-release.zip \
+ && rm metadata-qa-marc-0.5-release.zip \
+ && mv metadata-qa-marc-0.5 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
-
-ARG SMARTY_VERSION=3.1.44
-
-# install web application
-RUN apt-get update \
+ && sed -i.bak 's,BASE_OUTPUT_DIR=your/path,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 \
@@ -106,7 +83,6 @@ RUN apt-get update \
  && 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
 
-ARG SOLR_VERSION=8.11.1
 
 # install Solr
 RUN apt-get update \

diff --git a/src/main/assembly/release.xml b/src/main/assembly/release.xml
@@ -51,79 +51,91 @@
     </fileSets>
     <files>
         <file>
-            <source>common-variables</source>
+            <source>authorities</source>
             <fileMode>0755</fileMode>
         </file>
         <file>
-            <source>common-script</source>
+            <source>classifications</source>
             <fileMode>0755</fileMode>
         </file>
         <file>
-            <source>metadata-qa.sh</source>
+            <source>common-script</source>
             <fileMode>0755</fileMode>
         </file>
         <file>
-            <source>LICENSE</source>
-            <fileMode>0644</fileMode>
+            <source>common-variables</source>
+            <fileMode>0755</fileMode>
         </file>
         <file>
-            <source>README.md</source>
-            <fileMode>0644</fileMode>
+            <source>completeness</source>
+            <fileMode>0755</fileMode>
         </file>
         <file>
-            <source>setdir.sh.template</source>
+            <source>export-schema</source>
+            <fileMode>0755</fileMode>
         </file>
         <file>
-            <source>validator</source>
+            <source>formatter</source>
             <fileMode>0755</fileMode>
         </file>
         <file>
-            <source>prepare-solr</source>
+            <source>functional-analysis</source>
             <fileMode>0755</fileMode>
         </file>
         <file>
             <source>index</source>
             <fileMode>0755</fileMode>
         </file>
         <file>
-            <source>solr-functions</source>
+            <source>metadata-qa.sh</source>
             <fileMode>0755</fileMode>
         </file>
         <file>
-            <source>completeness</source>
+            <source>network-analysis</source>
             <fileMode>0755</fileMode>
         </file>
         <file>
-            <source>classifications</source>
+            <source>prepare-solr</source>
             <fileMode>0755</fileMode>
         </file>
         <file>
-            <source>authorities</source>
+            <source>record-patterns</source>
             <fileMode>0755</fileMode>
         </file>
         <file>
-            <source>tt-completeness</source>
+            <source>serial-score</source>
             <fileMode>0755</fileMode>
         </file>
         <file>
             <source>shelf-ready-completeness</source>
             <fileMode>0755</fileMode>
         </file>
         <file>
-            <source>serial-score</source>
+            <source>solr-functions</source>
             <fileMode>0755</fileMode>
         </file>
         <file>
-            <source>formatter</source>
+            <source>tt-completeness</source>
             <fileMode>0755</fileMode>
         </file>
         <file>
-            <source>functional-analysis</source>
+            <source>validator</source>
             <fileMode>0755</fileMode>
         </file>
         <file>
-            <source>network-analysis</source>
-            <fileMode>0755</fileMode>
+            <source>LICENSE</source>
+            <fileMode>0644</fileMode>
+        </file>
+        <file>
+            <source>README.md</source>
+            <fileMode>0644</fileMode>
+        </file>
+        <file>
+            <source>INSTALL.md</source>
+            <fileMode>0644</fileMode>
+        </file>
+        <file>
+            <source>setdir.sh.template</source>
         </file>
     </files>
 </assembly>