Added ImageMagick package

omeka-s-docker/.dockerignore

@@ -0,0 +1,9 @@
+.git
+.gitignore
+node_modules
+npm-debug.log
+Dockerfile*
+docker-compose*
+README.md
+LICENSE
+.vscode

omeka-s-docker/Dockerfile

@@ -12,7 +12,7 @@ RUN apk --update add ca-certificates
 
 # Install packages
 RUN apk --no-cache add php82 php82-fpm php82-opcache php82-openssl php82-curl php82-pdo php82-pdo_mysql php82-session \
-     php82-mbstring php82-fileinfo php82-xml nginx supervisor curl unzip
+     php82-mbstring php82-fileinfo php82-xml nginx supervisor curl unzip imagemagick
 
 # https://github.com/codecasts/php-alpine/issues/21
 #RUN ln -s /usr/bin/php7 /usr/bin/php
@@ -43,18 +43,23 @@ RUN unzip omeka-s-4.0.4.zip -d /var/www/html/ && rm omeka-s-4.0.4.zip
 ##COPY config/database.ini /var/www/html/omeka-s/config/database.ini
 
 # Make sure files/folders needed by the processes are accessable when they run under the nobody user
-RUN chown -R nobody.nobody /var/www/html && \
-  chown -R nobody.nobody /run && \
-  chown -R nobody.nobody /var/lib/nginx && \
-  chown -R nobody.nobody /var/log/nginx && \
-  chown -R nobody.nobody /var/log/php82
+
+# Create docker user and group of id's 1000
+
+RUN addgroup -S dockergroup -g 1000 && adduser -S dockeruser -u 1000 -G dockergroup
+
+RUN chown -R 1000:1000 /var/www/html && \
+  chown -R 1000:1000 /run && \
+  chown -R 1000:1000 /var/lib/nginx && \
+  chown -R 1000:1000 /var/log/nginx && \
+  chown -R 1000:1000 /var/log/php82
 
 # Change to Omeka-s base dir
 
 WORKDIR /var/www/html/omeka-s
 
 # Switch to use a non-root user from here on
-USER nobody
+USER dockeruser
 
 # Add application
 # WORKDIR /var/www/html

omeka-s-docker/assets/modules/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

omeka-s-docker/assets/themes/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

omeka-s-docker/docker-compose.yaml

@@ -11,9 +11,11 @@ services:
       - sample.env
     ports:
       - 127.0.0.1:3306:3306
+    volumes:
+      - /srv/pv/omeka/db/:/var/lib/mysql/
   
   omeka:
-    image: omeka-docker-dev
+    image: tms/omekas:josz
     container_name: omeka-s
     restart: always
     ports:
@@ -21,8 +23,8 @@ services:
     volumes:
       - ./config/nginx.conf:/etc/nginx/nginx.conf
       - ./config/database.ini:/var/www/html/omeka-s/config/database.ini
-      - ./assets/modules/:/var/www/html/omeka-s/modules/
-      - ./assets/themes/:/var/www/html/omeka-s/themes/
+      - /srv/pv/omeka/assets/modules/:/var/www/html/omeka-s/modules/
+      - /srv/pv/omeka/assets/themes/:/var/www/html/omeka-s/themes/
 
         #volumes:
         #  omeka: