Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ services:
# needed this volume mapping so changes to partials would be reflected in running app.
- ./src/angular-app:/var/www/src/angular-app

# To be able to run Python migration scripts from inside the container in dev mode
- ./scripts:/var/www/scripts

lfmerge:
build:
context: docker/lfmerge
Expand Down
6 changes: 6 additions & 0 deletions docker/app/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@ COPY --from=sillsdev/web-languageforge:wait-latest /wait /wait
# DEVELOPMENT BASE IMAGE
FROM sillsdev/web-languageforge:base-php AS development-base
RUN install-php-extensions xdebug-^3.1
# Python for scripts/copy_project_for_migration.py, which runs in this container
# because it needs Mongo, the project assets volume and the LFMerge sendreceive
# volume. Development only; the production image has no need for it.
RUN apt-get update \
&& apt-get install -y --no-install-recommends python3 \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
COPY docker/app/docker-php-ext-xdebug.ini /usr/local/etc/php/conf.d
RUN mv $PHP_INI_DIR/php.ini-development $PHP_INI_DIR/php.ini
COPY --from=sillsdev/web-languageforge:wait-latest /wait /wait
Expand Down
2 changes: 1 addition & 1 deletion docker/lfmerge/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FROM ghcr.io/sillsdev/lfmerge:2.0.142
FROM ghcr.io/sillsdev/lfmerge:2.0.143
# Do not add anything to this Dockerfile, it should stay empty
Loading
Loading