vips and iiif run in docker

acdh-oeaw · Oct 13, 2023 · 180ffca · 180ffca
1 parent 549dd78
commit 180ffca
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/starter.yaml b/.github/workflows/starter.yaml
@@ -118,7 +118,7 @@ jobs:
           IIIF = {
               'activate': True,
               'path': '/var/www/iipsrv/',
-              'url': 'http://localhost/iiif/',
+              'url': 'localhost:8080/iiif/',
               'version': 2,
               'conversion': True,
               'compression': 'jpeg'}

diff --git a/install/Dockerfile b/install/Dockerfile
@@ -8,16 +8,16 @@ RUN --mount=type=cache,target=/var/cache/apt \
     apt install -y --no-install-recommends python3-pandas python3-jinja2 python3-flask-cors python3-flask-restful p7zip-full &&\
     apt install -y --no-install-recommends python3-wand python3-rdflib python3-requests python3-dicttoxml python3-rdflib-jsonld python3-flasgger &&\
     apt install -y --no-install-recommends apache2 libapache2-mod-wsgi-py3 python3-coverage python3-nose exiftran &&\
-    apt install -y --no-install-recommends iipimage-server libvips42 libvips-tools &&\
+    apt install -y --no-install-recommends iipimage-server libvips-tools &&\
     apt install -y --no-install-recommends gettext npm python3-pip git postgresql-client-13 &&\
     apt install -y --no-install-recommends dos2unix locales locales-all &&\
     mkdir -p /var/www/openatlas /var/www/.cache /var/www/.local /var/www/.npm &&\
     chown -R www-data:www-data /var/www/.cache /var/www/.local /var/www/.npm /var/log/apache2 /var/run/apache2
 RUN cp -rp /usr/lib/iipimage-server/ /var/www/iipsrv/ &&\
     chown -R www-data /var/www/iipsrv/ &&\
-    chmod 755 -R /var/www/iipsrv/
+    chmod 777 -R /var/www/iipsrv/
 RUN rm /etc/apache2/mods-available/iipsrv.conf
-COPY /install/iipsrv.conf /etc/apache2/mods-available/
+COPY /install/iipsrv.conf /etc/apache2/mods-available/iipsrv.conf
 COPY --chown=www-data:www-data / /var/www/openatlas/
 RUN cd /var/www/openatlas && cp install/entrypoint.sh /entrypoint.sh &&\
     cp install/example_apache.conf /etc/apache2/sites-available/000-default.conf &&\

diff --git a/install/iipsrv.conf b/install/iipsrv.conf
@@ -2,7 +2,7 @@
 ScriptAlias /iiif "/var/www/iipsrv/iipsrv.fcgi"
 
 # Set the options on that directory
-<Location "/iipsrv/">
+<Location "/var/www/iipsrv/">
    AllowOverride None
    Options None
    <IfModule mod_version.c>