Skip to content

Commit 3437839

Browse files
committed
feat: change some config
1 parent d941d93 commit 3437839

File tree

5 files changed

+43
-44
lines changed

5 files changed

+43
-44
lines changed

.docker/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
FROM php:7.1-fpm
2-
3-
MAINTAINER Descamps Antoine <antoine.descamps@ineat-conseil.fr>
1+
FROM php:7.4-cli
42

53
RUN apt-get update && apt-get install -y \
64
libfreetype6-dev \
@@ -11,6 +9,7 @@ RUN apt-get update && apt-get install -y \
119
libpq-dev \
1210
libxpm-dev \
1311
libvpx-dev \
12+
vim \
1413
&& pecl install xdebug \
1514
&& docker-php-ext-enable xdebug \
1615
&& docker-php-ext-install -j$(nproc) mcrypt \
@@ -24,4 +23,4 @@ RUN apt-get update && apt-get install -y \
2423
--with-freetype-dir=/usr/include/ \
2524
--with-jpeg-dir=/usr/include/ \
2625
--with-xpm-dir=/usr/lib/x86_64-linux-gnu/ \
27-
--with-vpx-dir=/usr/lib/x86_64-linux-gnu/ \
26+
--with-vpx-dir=/usr/lib/x86_64-linux-gnu/ \

.docker/conf/php/php.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
date.timezone = Europe/Paris
1+
date.timezone = Asia/Novosibirsk
22

33
display_errors = 1
44
error_reporting = E_ALL

.docker/conf/php/xdebug.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
xdebug.remote_enable = 1
22
xdebug.remote_autostart = 1
33
xdebug.remote_connect_back = 1
4-
xdebug.remote_idekey = PHPSTORM
4+
xdebug.remote_idekey = VIM

.env

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
DB_NAME=dbname
2-
DB_USER=dbuser
3-
DB_PASSWORD=dbpwd
1+
DB_NAME=postgres
2+
DB_USER=root
3+
DB_PASSWORD=

docker-compose.yml

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
version: '3'
1+
version: "3.8"
22
services:
3-
web:
4-
image: nginx
5-
volumes:
6-
- ./.docker/conf/nginx/default.conf:/etc/nginx/conf.d/default.conf
7-
- .:/var/www/html
8-
ports:
9-
- 80:80
10-
restart: always
11-
depends_on:
12-
- php
13-
- db
14-
php:
15-
build: .docker
16-
restart: always
17-
volumes:
18-
- ./.docker/conf/php/php.ini:/usr/local/etc/php/conf.d/php.ini
19-
- ./.docker/conf/php/xdebug.ini:/usr/local/etc/php/conf.d/xdebug.ini
20-
- .:/var/www/html
21-
composer:
22-
image: composer
23-
volumes:
24-
- .:/app
25-
command: install
26-
db:
27-
image: postgres:10.1
28-
restart: always
29-
environment:
30-
- POSTGRES_DB=${DB_NAME}
31-
- POSTGRES_USER=${DB_USER}
32-
- POSTGRES_PASSWORD=${DB_PASSWORD}
33-
ports:
34-
- 5432:5432
35-
volumes:
36-
- ./.docker/conf/postgres/:/docker-entrypoint-initdb.d/
3+
web:
4+
image: nginx
5+
volumes:
6+
- ./.docker/conf/nginx/default.conf:/etc/nginx/conf.d/default.conf
7+
- .:/var/www/html
8+
ports:
9+
- 80:80
10+
restart: always
11+
depends_on:
12+
- php
13+
- db
14+
php:
15+
build: .docker
16+
restart: always
17+
volumes:
18+
- ./.docker/conf/php/php.ini:/usr/local/etc/php/conf.d/php.ini
19+
- ./.docker/conf/php/xdebug.ini:/usr/local/etc/php/conf.d/xdebug.ini
20+
- .:/var/www/html
21+
composer:
22+
image: composer
23+
volumes:
24+
- .:/app
25+
command: install
26+
db:
27+
image: postgres:14.4
28+
restart: always
29+
environment:
30+
- POSTGRES_DB=${DB_NAME}
31+
- POSTGRES_USER=${DB_USER}
32+
- POSTGRES_PASSWORD=${DB_PASSWORD}
33+
ports:
34+
- 5432:5432
35+
volumes:
36+
- ./.docker/conf/postgres/:/docker-entrypoint-initdb.d/

0 commit comments

Comments
 (0)