Skip to content

Commit f41722c

Browse files
committed
Merge remote-tracking branch 'origin/master' into v2
2 parents b645c67 + e45a56c commit f41722c

2 files changed

Lines changed: 80 additions & 1 deletion

File tree

.docker/symfony.conf

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,13 @@
4949
PassEnv EDA_KICAD_CATEGORY_DEPTH
5050
PassEnv SHOW_PART_IMAGE_OVERLAY
5151

52+
# Proxy configuration env
53+
PassEnv NO_PROXY HTTPS_PROXY HTTP_PROXY http_proxy https_proxy ALL_PROXY all_proxy
54+
5255
# For most configuration files from conf-available/, which are
5356
# enabled or disabled at a global level, it is possible to
5457
# include a line for only one particular virtual host. For example the
5558
# following line enables the CGI configuration for this host only
5659
# after it has been globally disabled with "a2disconf".
5760
#Include conf-available/serve-cgi-bin.conf
58-
</VirtualHost>
61+
</VirtualHost>

composer.lock

Lines changed: 76 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)