Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dev: Declare the Docker Composer project name in docker-compose.yml #786

Merged
merged 1 commit into from
Nov 4, 2024
Merged

dev: Declare the Docker Composer project name in docker-compose.yml #786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
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/development/docker-compose.yml
DOCKER_COMPOSE = docker compose -f docker/development/docker-compose.yml

ifdef NO_DOCKER
PHP = php
Expand Down
1 change: 0 additions & 1 deletion docker/bin/composer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
# SPDX-License-Identifier: AGPL-3.0-or-later

SCRIPT_PATH=$(dirname $(realpath -s $0))
export COMPOSE_PROJECT_NAME=bileto
export COMPOSE_FILE=$SCRIPT_PATH/../development/docker-compose.yml
export USER=$(id -u):$(id -g)

Expand Down
1 change: 0 additions & 1 deletion docker/bin/console
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
# SPDX-License-Identifier: AGPL-3.0-or-later

SCRIPT_PATH=$(dirname $(realpath -s $0))
export COMPOSE_PROJECT_NAME=bileto
export COMPOSE_FILE=$SCRIPT_PATH/../development/docker-compose.yml
export USER=$(id -u):$(id -g)

Expand Down
1 change: 0 additions & 1 deletion docker/bin/npm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
# SPDX-License-Identifier: AGPL-3.0-or-later

SCRIPT_PATH=$(dirname $(realpath -s $0))
export COMPOSE_PROJECT_NAME=bileto
export COMPOSE_FILE=$SCRIPT_PATH/../development/docker-compose.yml
export USER=$(id -u):$(id -g)

Expand Down
1 change: 0 additions & 1 deletion docker/bin/php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
# SPDX-License-Identifier: AGPL-3.0-or-later

SCRIPT_PATH=$(dirname $(realpath -s $0))
export COMPOSE_PROJECT_NAME=bileto
export COMPOSE_FILE=$SCRIPT_PATH/../development/docker-compose.yml
export USER=$(id -u):$(id -g)

Expand Down
1 change: 0 additions & 1 deletion docker/bin/psql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
# SPDX-License-Identifier: AGPL-3.0-or-later

SCRIPT_PATH=$(dirname $(realpath -s $0))
export COMPOSE_PROJECT_NAME=bileto
export COMPOSE_FILE=$SCRIPT_PATH/../development/docker-compose.yml

docker compose exec pgsql psql -U postgres "$@"
2 changes: 2 additions & 0 deletions docker/development/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
# Copyright 2022-2024 Probesys
# SPDX-License-Identifier: AGPL-3.0-or-later

name: bileto

services:
php:
image: bileto:php-dev
Expand Down
Loading