Skip to content
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

Jump to bottom

Make CA xdebuggable and clean up the Docker files #2686

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

Make CA xdebuggable and clean up the Docker files #2686

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
4 changes: 2 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ services:
healthcheck:
test: [CMD, curl, -f, http://localhost]
volumes:
- ./sourcecode/apis/contentauthor/docker/contentAuthor.conf.template:/etc/nginx/templates/contentAuthor.conf.template:ro
- ./sourcecode/apis/contentauthor/docker/no-security-theatre.conf:/etc/nginx/conf.d/no-security-theatre.conf:ro
- ./sourcecode/apis/contentauthor/docker/nginx/contentAuthor.conf.template:/etc/nginx/templates/contentAuthor.conf.template:ro
- ./sourcecode/apis/contentauthor/docker/nginx/no-security-theatre.conf:/etc/nginx/conf.d/no-security-theatre.conf:ro
- ./sourcecode/apis/contentauthor/public:/app/public
- ./sourcecode/apis/contentauthor/storage/app:/app/public/h5pstorage
- ./sourcecode/apis/contentauthor/vendor/h5p/h5p-editor:/app/public/h5p-editor-php-library:ro
Expand Down
7 changes: 4 additions & 3 deletions sourcecode/apis/contentauthor/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ENV COMPOSER_ALLOW_SUPERUSER=1 \
COMPOSER_HOME="/tmp" \
COMPOSER_MEMORY_LIMIT=-1

COPY docker/php.ini $PHP_INI_DIR/conf.d/99-custom.ini
COPY docker/php/php.ini $PHP_INI_DIR/conf.d/99-custom.ini

RUN echo "access.log = /dev/null" >> /usr/local/etc/php-fpm.d/www.conf;

Expand Down Expand Up @@ -136,6 +136,7 @@ RUN set -eux; \
;

COPY docker/php/docker-entrypoint-dev.sh /docker-entrypoint-dev.sh
COPY docker/php/php-dev.ini "$PHP_INI_DIR/conf.d/zz-php-dev.ini"

ENTRYPOINT ["/docker-entrypoint-dev.sh"]

Expand All @@ -147,5 +148,5 @@ FROM nginx:1-alpine AS web
ENV PHP_FPM_HOST "localhost:9000"

COPY --from=prod /app/public /app/public
COPY docker/no-security-theatre.conf /etc/nginx/conf.d/
COPY docker/contentAuthor.conf.template /etc/nginx/templates/contentAuthor.conf.template
COPY docker/nginx/no-security-theatre.conf /etc/nginx/conf.d/
COPY docker/nginx/contentAuthor.conf.template /etc/nginx/templates/contentAuthor.conf.template
0 ...author/docker/contentAuthor.conf.template → .../docker/nginx/contentAuthor.conf.template
View file
Open in desktop
File renamed without changes.
0 ...entauthor/docker/no-security-theatre.conf → ...hor/docker/nginx/no-security-theatre.conf
View file
Open in desktop
File renamed without changes.
7 changes: 7 additions & 0 deletions sourcecode/apis/contentauthor/docker/php/php-dev.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
xdebug.client_host = host.docker.internal
xdebug.discover_client_host = on
xdebug.idekey = PHPSTORM
xdebug.mode = develop,debug,profile
xdebug.output_dir = "${PWD}/profiles"
xdebug.profiler_output_name = "cachegrind.out.%u"
xdebug.start_with_request = trigger
0 sourcecode/apis/contentauthor/docker/php.ini → ...ode/apis/contentauthor/docker/php/php.ini
View file
Open in desktop
File renamed without changes.
14 changes: 0 additions & 14 deletions sourcecode/apis/contentauthor/docker/run-phpunit.sh
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions sourcecode/apis/contentauthor/profiles/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cachegrind.out.*
Loading