Skip to content

Commit bacf6cb

Browse files
authored
Merge pull request #2467 from tarlepp/chore(env)/dev-environment-php-configuration
Chore(env) - Mount `php-dev.ini` to local environment instead of copying that
2 parents c46d12f + 6d45f3c commit bacf6cb

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ services:
1515
- mariadb
1616
volumes:
1717
- ./:/app:cached
18+
- ./docker/php/php-dev.ini:/usr/local/etc/php/php.ini
1819
tmpfs:
1920
- /app/var/:uid=$HOST_UID,gid=$HOST_GID
2021
environment:

docker-entrypoint-dev.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ set -e
44
#
55
# If we're starting web-server we need to do following:
66
# 0) Basic linting of current JSON configuration file
7-
# 1) Copy updated php configuration file, with this we can change php
8-
# configuration without rebuilding image
7+
# 1) Export needed environment variables
98
# 2) Install all dependencies
109
# 3) Generate JWT encryption keys
1110
# 4) Create database if it not exists yet
@@ -17,8 +16,6 @@ set -e
1716
make lint-configuration
1817

1918
# Step 1
20-
cp /app/docker/php/php-dev.ini /usr/local/etc/php/php.ini
21-
2219
DOCKER_IP=$(/sbin/ip route|awk '/default/ { print $3 }')
2320

2421
export DOCKER_IP

0 commit comments

Comments
 (0)