Skip to content

Commit 38128dd

Browse files
committed
✨ improved docker config
1 parent b2c920e commit 38128dd

File tree

5 files changed

+17
-37
lines changed

5 files changed

+17
-37
lines changed

Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@ RUN apt-get update && \
77
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
88
a2enmod rewrite && a2enmod headers
99

10-
COPY . .
11-
COPY docker/apache2/apache2.conf /etc/apache2/sites-enabled/000-default.conf
12-
13-
1410
FROM base as dev
11+
12+
## Install composer
1513
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
1614

15+
## Install symfony cli
1716
RUN curl -sS https://get.symfony.com/cli/installer | bash
1817
RUN mv /root/.symfony/bin/symfony /usr/local/bin/symfony

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ install:
1616

1717
start:
1818
$(DOCKER_COMPOSE) up -d
19-
open "http://localhost:8082"
19+
open "http://localhost:8080"
2020

2121
stop:
2222
$(DOCKER_COMPOSE) down

docker-compose.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ services:
55
context: .
66
target: dev
77
ports:
8-
- '8082:80'
8+
- '8080:80'
99
volumes:
1010
- .:/var/www/html
11+
- ./docker/apache2/apache2.conf:/etc/apache2/sites-enabled/000-default.conf
1112

1213
mongo:
1314
image: mongo

docker/apache2/apache2.conf

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,15 @@
11
<VirtualHost *:80>
2-
# The ServerName directive sets the request scheme, hostname and port that
3-
# the server uses to identify itself. This is used when creating
4-
# redirection URLs. In the context of virtual hosts, the ServerName
5-
# specifies what hostname must appear in the request's Host: header to
6-
# match this virtual host. For the default virtual host (this file) this
7-
# value is not decisive as it is used as a last resort host regardless.
8-
# However, you must set it for any further virtual host explicitly.
9-
ServerName localhost
2+
ServerName localhost
103

11-
ServerAdmin webmaster@localhost
12-
DocumentRoot /var/www/html/public
4+
ServerAdmin webmaster@localhost
5+
DocumentRoot /var/www/html/public
136

14-
<Directory /var/www/public>
15-
AllowOverride All
16-
Order Allow,Deny
17-
Allow from All
18-
</Directory>
7+
<Directory /var/www/public>
8+
AllowOverride All
9+
Order Allow,Deny
10+
Allow from All
11+
</Directory>
1912

20-
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
21-
# error, crit, alert, emerg.
22-
# It is also possible to configure the loglevel for particular
23-
# modules, e.g.
24-
#LogLevel info ssl:warn
25-
26-
ErrorLog ${APACHE_LOG_DIR}/error.log
27-
CustomLog ${APACHE_LOG_DIR}/access.log combined
28-
29-
# For most configuration files from conf-available/, which are
30-
# enabled or disabled at a global level, it is possible to
31-
# include a line for only one particular virtual host. For example the
32-
# following line enables the CGI configuration for this host only
33-
# after it has been globally disabled with "a2disconf".
34-
#Include conf-available/serve-cgi-bin.conf
13+
ErrorLog ${APACHE_LOG_DIR}/error.log
14+
CustomLog ${APACHE_LOG_DIR}/access.log combined
3515
</VirtualHost>

readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ make install
1414
make start
1515
```
1616

17-
> App should now be available on : [http://localhost:8082](http://localhost:8082/)
17+
> App should now be available on : [http://localhost:8080](http://localhost:8080/)
1818
1919
## Database
2020

0 commit comments

Comments
 (0)