Skip to content

Commit

Permalink
tec: Use Docker Compose v2
Browse files Browse the repository at this point in the history
This version is directly integrated with Docker, and has a better support
for and improved performance.
  • Loading branch information
marien-probesys committed Aug 1, 2023
1 parent 35b1826 commit 8d65095
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

USER = $(shell id -u):$(shell id -g)

DOCKER_COMPOSE = docker-compose -p bileto -f docker/docker-compose.yml
DOCKER_COMPOSE = docker compose -p bileto -f docker/docker-compose.yml

ifdef NO_DOCKER
PHP = php
Expand Down
6 changes: 3 additions & 3 deletions docker/bin/composer
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ export COMPOSE_PROJECT_NAME=bileto
export COMPOSE_FILE=$SCRIPT_PATH/../docker-compose.yml
export USER=$(id -u):$(id -g)

if [ -z `docker-compose ps -q php` ] || [ -z `docker ps -q --no-trunc | grep $(docker-compose ps -q php)` ]; then
docker-compose run -T --rm --no-deps php composer "$@"
if [ -z `docker compose ps -q php` ] || [ -z `docker ps -q --no-trunc | grep $(docker compose ps -q php)` ]; then
docker compose run -T --rm --no-deps php composer "$@"
else
docker-compose exec -T php composer "$@"
docker compose exec -T php composer "$@"
fi
6 changes: 3 additions & 3 deletions docker/bin/console
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ export COMPOSE_PROJECT_NAME=bileto
export COMPOSE_FILE=$SCRIPT_PATH/../docker-compose.yml
export USER=$(id -u):$(id -g)

if [ -z `docker-compose ps -q php` ] || [ -z `docker ps -q --no-trunc | grep $(docker-compose ps -q php)` ]; then
docker-compose run -T --rm --no-deps php php bin/console "$@"
if [ -z `docker compose ps -q php` ] || [ -z `docker ps -q --no-trunc | grep $(docker compose ps -q php)` ]; then
docker compose run -T --rm --no-deps php php bin/console "$@"
else
docker-compose exec -T php php bin/console "$@"
docker compose exec -T php php bin/console "$@"
fi
6 changes: 3 additions & 3 deletions docker/bin/npm
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ export COMPOSE_PROJECT_NAME=bileto
export COMPOSE_FILE=$SCRIPT_PATH/../docker-compose.yml
export USER=$(id -u):$(id -g)

if [ -z `docker-compose ps -q bundler` ] || [ -z `docker ps -q --no-trunc | grep $(docker-compose ps -q bundler)` ]; then
docker-compose run --rm --no-deps bundler npm "$@"
if [ -z `docker compose ps -q bundler` ] || [ -z `docker ps -q --no-trunc | grep $(docker compose ps -q bundler)` ]; then
docker compose run --rm --no-deps bundler npm "$@"
else
docker-compose exec bundler npm "$@"
docker compose exec bundler npm "$@"
fi
6 changes: 3 additions & 3 deletions docker/bin/php
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ export COMPOSE_PROJECT_NAME=bileto
export COMPOSE_FILE=$SCRIPT_PATH/../docker-compose.yml
export USER=$(id -u):$(id -g)

if [ -z `docker-compose ps -q php` ] || [ -z `docker ps -q --no-trunc | grep $(docker-compose ps -q php)` ]; then
docker-compose run -T --rm --no-deps php php "$@"
if [ -z `docker compose ps -q php` ] || [ -z `docker ps -q --no-trunc | grep $(docker compose ps -q php)` ]; then
docker compose run -T --rm --no-deps php php "$@"
else
docker-compose exec -T php php "$@"
docker compose exec -T php php "$@"
fi
2 changes: 1 addition & 1 deletion docker/bin/psql
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ SCRIPT_PATH=$(dirname $(realpath -s $0))
export COMPOSE_PROJECT_NAME=bileto
export COMPOSE_FILE=$SCRIPT_PATH/../docker-compose.yml

docker-compose exec database psql -U postgres "$@"
docker compose exec database psql -U postgres "$@"
3 changes: 2 additions & 1 deletion docs/developers/setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

The development environment is managed with Docker by default.

First, make sure to install [Docker Engine](https://docs.docker.com/engine/install/) and [Docker Compose](https://docs.docker.com/compose/install/). Both `docker` and `docker-compose` must be executable by your normal user.
First, make sure to install [Docker Engine](https://docs.docker.com/engine/install/).
The `docker` command must be executable by your normal user.

## Install Bileto

Expand Down

0 comments on commit 8d65095

Please sign in to comment.