Compare commits

...

6 Commits
main ... josz

Author SHA1 Message Date
tms e332d9e797 Added ImageMagick package 2023-09-25 18:11:24 +02:00
tms 731eae884c Changed container user and group 2023-09-25 17:27:17 +02:00
tms c0e6d0848f Added .dockerignore 2023-09-25 14:07:33 +02:00
tms 5ddc799b3b Added .gitignore to assets 2023-09-25 14:03:27 +02:00
tms 1ea0b8f99d Fixed modules path 2023-09-25 13:58:39 +02:00
tms ee4d67f2b6 Deploy server compose customization 2023-09-25 13:48:49 +02:00
5 changed files with 34 additions and 10 deletions

View File

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

View File

@ -12,7 +12,7 @@ RUN apk --update add ca-certificates
# Install packages # Install packages
RUN apk --no-cache add php82 php82-fpm php82-opcache php82-openssl php82-curl php82-pdo php82-pdo_mysql php82-session \ 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 # https://github.com/codecasts/php-alpine/issues/21
#RUN ln -s /usr/bin/php7 /usr/bin/php #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 ##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 # 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 && \ # Create docker user and group of id's 1000
chown -R nobody.nobody /var/lib/nginx && \
chown -R nobody.nobody /var/log/nginx && \ RUN addgroup -S dockergroup -g 1000 && adduser -S dockeruser -u 1000 -G dockergroup
chown -R nobody.nobody /var/log/php82
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 # Change to Omeka-s base dir
WORKDIR /var/www/html/omeka-s WORKDIR /var/www/html/omeka-s
# Switch to use a non-root user from here on # Switch to use a non-root user from here on
USER nobody USER dockeruser
# Add application # Add application
# WORKDIR /var/www/html # WORKDIR /var/www/html

View File

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

View File

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

View File

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