Compare commits

..

2 Commits
josz ... main

Author SHA1 Message Date
tms 4f795ee82d Added .dockerignore 2023-09-25 14:11:04 +02:00
tms f07c3417cb Added .gitignore to assets 2023-09-25 14:10:56 +02:00
2 changed files with 10 additions and 17 deletions

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 imagemagick php82-mbstring php82-fileinfo php82-xml nginx supervisor curl unzip
# 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,23 +43,18 @@ 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 && \
# Create docker user and group of id's 1000 chown -R nobody.nobody /run && \
chown -R nobody.nobody /var/lib/nginx && \
RUN addgroup -S dockergroup -g 1000 && adduser -S dockeruser -u 1000 -G dockergroup chown -R nobody.nobody /var/log/nginx && \
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 dockeruser USER nobody
# Add application # Add application
# WORKDIR /var/www/html # WORKDIR /var/www/html

View File

@ -11,11 +11,9 @@ 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: tms/omekas:josz image: omeka-docker-dev
container_name: omeka-s container_name: omeka-s
restart: always restart: always
ports: ports:
@ -23,8 +21,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
- /srv/pv/omeka/assets/modules/:/var/www/html/omeka-s/modules/ - ./assets/modules/:/var/www/html/omeka-s/modules/
- /srv/pv/omeka/assets/themes/:/var/www/html/omeka-s/themes/ - ./assets/themes/:/var/www/html/omeka-s/themes/
#volumes: #volumes:
# omeka: # omeka: