Compare commits

..

No commits in common. "main" and "RC" have entirely different histories.
main ... RC

6 changed files with 6 additions and 34 deletions

View File

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

View File

@ -1,7 +1,7 @@
FROM alpine:3.18 FROM alpine:3.18
LABEL Maintainer="TMS <tms@lameops.io>" \ LABEL Maintainer="Jabar Digital Service <digital.service@jabarprov.go.id>" \
Description="Omeka S docker container with NGINX" Description="Lightweight container with Nginx 1.16 & PHP-FPM 7.4 based on Alpine Linux (forked from trafex/alpine-nginx-php7)."
#ADD https://dl.bintray.com/php-alpine/key/php-alpine.rsa.pub /etc/apk/keys/php-alpine.rsa.pub #ADD https://dl.bintray.com/php-alpine/key/php-alpine.rsa.pub /etc/apk/keys/php-alpine.rsa.pub
@ -32,16 +32,13 @@ COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
# Setup documexnt root # Setup documexnt root
RUN mkdir -p /var/www/html RUN mkdir -p /var/www/html
#RUN mkdir -p /var/www/html/omeka-s
##RUN mkdir -p /var/www/html/omeka-s
# Fetch Omeka-S # Fetch Omeka-S
WORKDIR /tmp WORKDIR /tmp
ADD https://github.com/omeka/omeka-s/releases/download/v4.0.4/omeka-s-4.0.4.zip /tmp ADD https://github.com/omeka/omeka-s/releases/download/v4.0.4/omeka-s-4.0.4.zip /tmp
RUN unzip omeka-s-4.0.4.zip -d /var/www/html/ && rm omeka-s-4.0.4.zip 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 && \ RUN chown -R nobody.nobody /var/www/html && \
chown -R nobody.nobody /run && \ chown -R nobody.nobody /run && \
@ -49,9 +46,6 @@ RUN chown -R nobody.nobody /var/www/html && \
chown -R nobody.nobody /var/log/nginx && \ chown -R nobody.nobody /var/log/nginx && \
chown -R nobody.nobody /var/log/php82 chown -R nobody.nobody /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 # Switch to use a non-root user from here on
USER nobody USER nobody

View File

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

View File

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

View File

@ -1,5 +1,5 @@
user = "omeka" user = "omeka"
password = "uzu7ZoLaiGhiequi" password = "uzu7ZoLaiGhiequi"
dbname = "omeka" dbname = "omeka"
host = "db" host = "127.0.0.1"
port = "3306" port = "3306"

View File

@ -5,7 +5,6 @@ services:
db: db:
image: percona image: percona
container_name: omeka-percona
restart: always restart: always
env_file: env_file:
- sample.env - sample.env
@ -14,15 +13,11 @@ services:
omeka: omeka:
image: omeka-docker-dev image: omeka-docker-dev
container_name: omeka-s
restart: always restart: always
ports: ports:
- 127.0.0.1:8080:8080 - 127.0.0.1:8080:8080
volumes: volumes:
- ./config/nginx.conf:/etc/nginx/nginx.conf - /home/tadziu/dev/omeka-s-docker/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/
#volumes: #volumes:
# omeka: # omeka: