Skip to content

Commit

Permalink
Merge pull request #1024 from wirDesign-communication-AG/v3.0.33
Browse files Browse the repository at this point in the history
v3.0.33
  • Loading branch information
pmdevelopment authored Sep 9, 2024
2 parents 651a92a + 1009db9 commit ee50d69
Show file tree
Hide file tree
Showing 7 changed files with 90 additions and 70 deletions.
3 changes: 2 additions & 1 deletion .env.test
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ APP_SECRET=test
APP_LOCALE=de
APP_CACHE_DIR=/var/www/wirhub/var/cache
PANTHER_APP_ENV=test
PANTHER_CHROME_ARGUMENTS="--ignore-certificate-errors --disable-dev-shm-usage --log-level=DEBUG --log-path=/var/www/wirhub/var/log --user-data-dir=/var/www/wirhub/var/chrome"
PANTHER_NO_HEADLESS=true
PANTHER_CHROME_ARGUMENTS="--ignore-certificate-errors --disable-dev-shm-usage --verbose --log-path=/var/www/wirhub/var/log --user-data-dir=/var/www/wirhub/var/chrome --headless=old --window-size=1280,1100 --disable-gpu --disable-extensions --remote-debugging-port=9222"
PANTHER_EXTERNAL_BASE_URI=http://localhost
PANTHER_NO_SANDBOX=1
PANTHER_WEB_SERVER_DIR=./public
Expand Down
6 changes: 5 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,16 @@ RUN sed -i 's/post_max_size = 8M/post_max_size = 64M/g' /etc/php/8.2/apache2/php
RUN sed -i 's/;date.timezone =/date.timezone = Europe\/Berlin/g' /etc/php/8.2/cli/php.ini
RUN sed -i 's/;date.timezone =/date.timezone = Europe\/Berlin/g' /etc/php/8.2/apache2/php.ini

RUN rm /etc/php/8.2/apache2/conf.d/10-opcache.ini
COPY dockerfiles/php/10-opcache.ini /etc/php/8.2/apache2/conf.d


# vorerst die alte 00-default.conf löschen und ersetzen. so funktionert es ohne https
RUN rm /etc/apache2/sites-available/000-default.conf
COPY dockerfiles/virtual_hosts /etc/apache2/sites-available

### Configure Webserver
RUN echo "<h1>Apache server started: cd /var/www/html/index.html</h1>" > /var/www/html/index.html
RUN echo "<h1>Webserver running</h1>" > /var/www/html/index.html
RUN a2enmod rewrite

# setting the correct server timezone
Expand Down
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
init:
COMPOSER_ALLOW_SUPERUSER=1 composer install --no-dev --optimize-autoloader
COMPOSER_ALLOW_SUPERUSER=1 composer install --no-dev
COMPOSER_ALLOW_SUPERUSER=1 composer dump-env prod
COMPOSER_ALLOW_SUPERUSER=1 composer dump-autoload --no-dev --classmap-authoritative
php bin/console doctrine:migrations:migrate --no-interaction
php bin/console app:theme:refresh
php bin/console app:update
php bin/console app:theme:refresh

ifeq ($(shell id -u), 0)
chown -R www-data:www-data public/
chown -R www-data:www-data var/
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"symfony/framework-bundle": "7.1.*",
"symfony/runtime": "7.1.*",
"symfony/yaml": "7.1.*",
"wirdesign-communication-ag/wirhub": "^3.0.31"
"wirdesign-communication-ag/wirhub": "wip/kws-81-2-dev"
},
"scripts": {
"auto-scripts": {
Expand Down
Loading

0 comments on commit ee50d69

Please sign in to comment.