Skip to content

Commit 7fa08f7

Browse files
FinalAngelFinalAngel
committed
fix: use apache image instead
1 parent 9f2c9d3 commit 7fa08f7

File tree

6 files changed

+9836
-9153
lines changed

6 files changed

+9836
-9153
lines changed

‎.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
###> symfony/framework-bundle ###
1818
APP_ENV=dev
19-
APP_SECRET=0dfa0f77af1cdd36fe03a59da0722227
19+
APP_SECRET=8d3986c3f15a4b7e3d02d6a495f33488
2020
###< symfony/framework-bundle ###
2121

2222
###> doctrine/doctrine-bundle ###
@@ -26,7 +26,7 @@ APP_SECRET=0dfa0f77af1cdd36fe03a59da0722227
2626
# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
2727
# DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=8.0.32&charset=utf8mb4"
2828
# DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
29-
DATABASE_URL="postgresql://app:[email protected]:5432/app?serverVersion=16&charset=utf8"
29+
# DATABASE_URL="postgresql://app:[email protected]:5432/app?serverVersion=16&charset=utf8"
3030
###< doctrine/doctrine-bundle ###
3131

3232
###> symfony/messenger ###

‎Dockerfile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.3-fpm
1+
FROM php:8.3-apache
22

33
ENV COMPOSER_ALLOW_SUPERUSER=1
44

@@ -14,10 +14,16 @@ RUN curl -sS https://get.symfony.com/cli/installer | bash
1414
RUN mv /root/.symfony5/bin/symfony /usr/bin/symfony
1515

1616
COPY composer.* /var/www/html/
17-
RUN composer install --no-interaction --no-dev --no-scripts
17+
RUN composer install --no-interaction --no-scripts
1818

1919
COPY . /var/www/html
2020

21+
# configure for serving on apache
22+
RUN a2enmod rewrite
23+
ENV APACHE_DOCUMENT_ROOT /var/www/html/public
24+
RUN sed -i -e 's|/var/www/html|${APACHE_DOCUMENT_ROOT}|g' /etc/apache2/sites-available/000-default.conf
25+
RUN sed -i -e 's|/var/www/html|${APACHE_DOCUMENT_ROOT}|g' /etc/apache2/apache2.conf
26+
2127
EXPOSE 80
2228

23-
CMD ["symfony", "server:start", "--port", "80"]
29+
CMD ["apache2-foreground"]

‎composer.json

Lines changed: 103 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,108 @@
11
{
2-
"type": "project",
3-
"license": "proprietary",
4-
"minimum-stability": "stable",
5-
"prefer-stable": true,
6-
"require": {
7-
"php": ">=8.2",
8-
"ext-ctype": "*",
9-
"ext-iconv": "*",
10-
"doctrine/dbal": "^3",
11-
"doctrine/doctrine-bundle": "^2.12",
12-
"doctrine/doctrine-migrations-bundle": "^3.3",
13-
"doctrine/orm": "^3.1",
14-
"phpdocumentor/reflection-docblock": "^5.4",
15-
"phpstan/phpdoc-parser": "^1.28",
16-
"symfony/asset": "7.0.*",
17-
"symfony/asset-mapper": "7.0.*",
18-
"symfony/console": "7.0.*",
19-
"symfony/doctrine-messenger": "7.0.*",
20-
"symfony/dotenv": "7.0.*",
21-
"symfony/expression-language": "7.0.*",
22-
"symfony/flex": "^2",
23-
"symfony/form": "7.0.*",
24-
"symfony/framework-bundle": "7.0.*",
25-
"symfony/http-client": "7.0.*",
26-
"symfony/intl": "7.0.*",
27-
"symfony/mailer": "7.0.*",
28-
"symfony/mime": "7.0.*",
29-
"symfony/monolog-bundle": "^3.0",
30-
"symfony/notifier": "7.0.*",
31-
"symfony/process": "7.0.*",
32-
"symfony/property-access": "7.0.*",
33-
"symfony/property-info": "7.0.*",
34-
"symfony/runtime": "7.0.*",
35-
"symfony/security-bundle": "7.0.*",
36-
"symfony/serializer": "7.0.*",
37-
"symfony/stimulus-bundle": "^2.17",
38-
"symfony/string": "7.0.*",
39-
"symfony/translation": "7.0.*",
40-
"symfony/twig-bundle": "7.0.*",
41-
"symfony/ux-turbo": "^2.17",
42-
"symfony/validator": "7.0.*",
43-
"symfony/web-link": "7.0.*",
44-
"symfony/yaml": "7.0.*",
45-
"twig/extra-bundle": "^2.12|^3.0",
46-
"twig/twig": "^2.12|^3.0"
47-
},
48-
"config": {
49-
"allow-plugins": {
50-
"php-http/discovery": true,
51-
"symfony/flex": true,
52-
"symfony/runtime": true
2+
"type": "project",
3+
"license": "proprietary",
4+
"minimum-stability": "stable",
5+
"prefer-stable": true,
6+
"require": {
7+
"php": ">=8.2",
8+
"ext-ctype": "*",
9+
"ext-iconv": "*",
10+
"doctrine/dbal": "^3",
11+
"doctrine/doctrine-bundle": "^2.12",
12+
"doctrine/doctrine-migrations-bundle": "^3.3",
13+
"doctrine/orm": "^3.1",
14+
"phpdocumentor/reflection-docblock": "^5.4",
15+
"phpstan/phpdoc-parser": "^1.28",
16+
"symfony/asset": "7.0.*",
17+
"symfony/asset-mapper": "7.0.*",
18+
"symfony/console": "7.0.*",
19+
"symfony/doctrine-messenger": "7.0.*",
20+
"symfony/dotenv": "7.0.*",
21+
"symfony/expression-language": "7.0.*",
22+
"symfony/flex": "^2",
23+
"symfony/form": "7.0.*",
24+
"symfony/framework-bundle": "7.0.*",
25+
"symfony/http-client": "7.0.*",
26+
"symfony/intl": "7.0.*",
27+
"symfony/mailer": "7.0.*",
28+
"symfony/mime": "7.0.*",
29+
"symfony/monolog-bundle": "^3.0",
30+
"symfony/notifier": "7.0.*",
31+
"symfony/process": "7.0.*",
32+
"symfony/property-access": "7.0.*",
33+
"symfony/property-info": "7.0.*",
34+
"symfony/runtime": "7.0.*",
35+
"symfony/security-bundle": "7.0.*",
36+
"symfony/serializer": "7.0.*",
37+
"symfony/stimulus-bundle": "^2.17",
38+
"symfony/string": "7.0.*",
39+
"symfony/translation": "7.0.*",
40+
"symfony/twig-bundle": "7.0.*",
41+
"symfony/ux-turbo": "^2.17",
42+
"symfony/validator": "7.0.*",
43+
"symfony/web-link": "7.0.*",
44+
"symfony/yaml": "7.0.*",
45+
"twig/extra-bundle": "^2.12|^3.0",
46+
"twig/twig": "^2.12|^3.0"
5347
},
54-
"sort-packages": true
55-
},
56-
"autoload": {
57-
"psr-4": {
58-
"App\\": "src/"
59-
}
60-
},
61-
"autoload-dev": {
62-
"psr-4": {
63-
"App\\Tests\\": "tests/"
64-
}
65-
},
66-
"replace": {
67-
"symfony/polyfill-ctype": "*",
68-
"symfony/polyfill-iconv": "*",
69-
"symfony/polyfill-php72": "*",
70-
"symfony/polyfill-php73": "*",
71-
"symfony/polyfill-php74": "*",
72-
"symfony/polyfill-php80": "*",
73-
"symfony/polyfill-php81": "*",
74-
"symfony/polyfill-php82": "*"
75-
},
76-
"scripts": {
77-
"auto-scripts": {
78-
"cache:clear": "symfony-cmd",
79-
"assets:install %PUBLIC_DIR%": "symfony-cmd",
80-
"importmap:install": "symfony-cmd"
48+
"config": {
49+
"allow-plugins": {
50+
"php-http/discovery": true,
51+
"symfony/flex": true,
52+
"symfony/runtime": true
53+
},
54+
"sort-packages": true
55+
},
56+
"autoload": {
57+
"psr-4": {
58+
"App\\": "src/"
59+
}
60+
},
61+
"autoload-dev": {
62+
"psr-4": {
63+
"App\\Tests\\": "tests/"
64+
}
65+
},
66+
"replace": {
67+
"symfony/polyfill-ctype": "*",
68+
"symfony/polyfill-iconv": "*",
69+
"symfony/polyfill-php72": "*",
70+
"symfony/polyfill-php73": "*",
71+
"symfony/polyfill-php74": "*",
72+
"symfony/polyfill-php80": "*",
73+
"symfony/polyfill-php81": "*",
74+
"symfony/polyfill-php82": "*"
75+
},
76+
"scripts": {
77+
"auto-scripts": {
78+
"cache:clear": "symfony-cmd",
79+
"assets:install %PUBLIC_DIR%": "symfony-cmd",
80+
"importmap:install": "symfony-cmd"
81+
},
82+
"post-install-cmd": [
83+
"@auto-scripts"
84+
],
85+
"post-update-cmd": [
86+
"@auto-scripts"
87+
]
88+
},
89+
"conflict": {
90+
"symfony/symfony": "*"
91+
},
92+
"extra": {
93+
"symfony": {
94+
"allow-contrib": false,
95+
"require": "7.0.*"
96+
}
8197
},
82-
"post-install-cmd": [
83-
"@auto-scripts"
84-
],
85-
"post-update-cmd": [
86-
"@auto-scripts"
87-
]
88-
},
89-
"conflict": {
90-
"symfony/symfony": "*"
91-
},
92-
"extra": {
93-
"symfony": {
94-
"allow-contrib": false,
95-
"require": "7.0.*"
98+
"require-dev": {
99+
"phpunit/phpunit": "^9.5",
100+
"symfony/browser-kit": "7.0.*",
101+
"symfony/css-selector": "7.0.*",
102+
"symfony/debug-bundle": "7.0.*",
103+
"symfony/maker-bundle": "^1.0",
104+
"symfony/phpunit-bridge": "^7.0",
105+
"symfony/stopwatch": "7.0.*",
106+
"symfony/web-profiler-bundle": "7.0.*"
96107
}
97-
},
98-
"require-dev": {
99-
"phpunit/phpunit": "^9.5",
100-
"symfony/browser-kit": "7.0.*",
101-
"symfony/css-selector": "7.0.*",
102-
"symfony/debug-bundle": "7.0.*",
103-
"symfony/maker-bundle": "^1.0",
104-
"symfony/phpunit-bridge": "^7.0",
105-
"symfony/stopwatch": "7.0.*",
106-
"symfony/web-profiler-bundle": "7.0.*"
107-
}
108108
}

0 commit comments

Comments
 (0)