Skip to content

Commit

Permalink
Make overriding of docker-compose more easy
Browse files Browse the repository at this point in the history
  • Loading branch information
Aeliot-Tm committed Feb 13, 2023
1 parent 636703c commit 49dca95
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
1 change: 0 additions & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
COMPOSE_PROJECT_NAME=tramaint
COMPOSE_FILE=docker/docker-compose.yml

TRANS_MAINTAIN_INSERT_MISSED_KEYS=no
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@
.php-cs-fixer.cache
.phpunit.result.cache
composer.lock
docker-compose.override.yml
4 changes: 2 additions & 2 deletions docker/Dockerfile → Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG PHP_VERSION=php:7.4-cli
FROM ${PHP_VERSION}
ARG PHP_IMAGE
FROM ${PHP_IMAGE}
RUN apt-get --allow-releaseinfo-change update && apt-get install -y \
libxml2-dev \
libzip-dev \
Expand Down
4 changes: 2 additions & 2 deletions docker/docker-compose.yml → docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ version: '3.1'
services:
php:
build:
context: ..
dockerfile: docker/Dockerfile
context: .
dockerfile: Dockerfile
args:
PHP_IMAGE: ${PHP_IMAGE:-php:7.4-cli}
PHP_XDEBUG_PORT: ${PHP_XDEBUG_PORT:-9003}
Expand Down

0 comments on commit 49dca95

Please sign in to comment.