Skip to content

Revert "Merge pull request #71 from uklibraries/bind-mount-fix" #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cokernel wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Revert "Merge pull request #71 from uklibraries/bind-mount-fix" #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ app/theme
/xml
/secrets
/vendor
db.ini

10 changes: 8 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,15 @@ services:
- ./assets/frontpage-assets/files:/app/files
# Bind mount for dev, baked in image for production
- ./php-fpm/php.ini-development:/usr/local/etc/php/conf.d/php.ini
- ./app:/app
- omeka_static:/app
- ./phpunit.xml:/phpunit.xml
develop:
watch:
- action: sync+restart
path: ./app
target: /app
ignore:
- node_modules/
- action: sync+restart
path: ./tests
target: /tests
Expand All @@ -34,7 +39,7 @@ services:
volumes:
- ./assets/frontpage-assets/files:/app/files
- ./nginx/default.conf:/etc/nginx/conf.d/default.conf
- ./app:/app
- omeka_static:/app
- findingaid:/opt/findingaid
depends_on:
- omeka
Expand Down Expand Up @@ -74,6 +79,7 @@ services:

volumes:
db_data:
omeka_static:
findingaid:

networks:
Expand Down
1 change: 0 additions & 1 deletion entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ find "$OMEKA_ROOT/files" -type d -exec chmod 0775 "{}" \;
find "$OMEKA_ROOT/files" -type f -exec chmod 0664 "{}" \;

if [ "$APP_ENV" == "development" ]; then
npm install
bash "$OMEKA_ROOT/exe/minify.sh"
set +e
/vendor/bin/phpcs -w --exclude=Generic.Files.LineLength --standard=PSR12 /tests /app/catalog.php /app/application/libraries/ExploreUK
Expand Down