Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9856c6c

Browse files
author
rccc
committed
add postgres
1 parent5a10f2c commit9856c6c

File tree

17 files changed

+2571
-1918
lines changed

17 files changed

+2571
-1918
lines changed

‎.env‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,24 @@
1515
# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
1616

1717
###> docker-compose configuration ###
18-
COMPOSE_PROJECT_NAME=environment2
18+
COMPOSE_PROJECT_NAME=sfdocker
1919
###< docker-compose configuration ###
2020

2121
###> docker configuration that can be overridden in .env.local ###
22-
WEB_PORT_HTTP=80
22+
WEB_PORT_HTTP=8000
2323
WEB_PORT_SSL=443
2424
# XDEBUG_CONFIG possible values: main|osx. Use main value for Linux and Windows, osx value for MacOS.
2525
XDEBUG_CONFIG=main
26-
# MySQL version, recommend values: 8.1|8.0
27-
MYSQL_VERSION=8.1
28-
# MySQL INNODB_USE_NATIVE_AIO possible values: 1|0. Set to 0 when AIO interface is not supported on OSX. https://dev.mysql.com/doc/refman/8.0/en/innodb-parameters.html#sysvar_innodb_use_native_aio
29-
INNODB_USE_NATIVE_AIO=1
30-
# Sometimes AWS MySQL RDS has SQL_MODE="NO_ENGINE_SUBSTITUTION" (https://github.com/awsdocs/amazon-rds-user-guide/issues/160) but MySQL default described here - https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_sql_mode
31-
SQL_MODE="ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"
26+
POSTGRES_VERSION=14.10
27+
POSTGRES_DB=app
28+
POSTGRES_USER=dbuser
29+
POSTGRES_PASSWORD=dbuser01
3230
###< docker configuration that can be overridden in .env.local ###
3331

3432
###> symfony/framework-bundle ###
3533
APP_ENV=dev
3634
APP_DEBUG=1
37-
APP_SECRET=42f011ec3a7bde0bec87364b1d967193
35+
APP_SECRET=5f728fb1f9bd1761e7217484a9d052753923a3d7
3836
TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR
3937
#TRUSTED_HOSTS='^localhost|example\.com$'
4038
###< symfony/framework-bundle ###
@@ -44,16 +42,16 @@ TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR
4442
# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
4543
#
4644
# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
47-
#DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=15&charset=utf8"
48-
DATABASE_URL=mysql://root:secret@mysql:3306/symfony
45+
DATABASE_URL="postgresql://dbuser:dbuser01@127.0.0.1:5432/app?serverVersion=14.10&charset=utf8"
46+
#DATABASE_URL=mysql://root:secret@mysql:3306/symfony
4947
###< doctrine/doctrine-bundle ###
5048

5149
###> symfony/mailer ###
5250
MAILER_DSN=smtp://user:pass@mail:1025
5351
###< symfony/mailer ###
5452

5553
###> symfony/messenger ###
56-
MESSENGER_TRANSPORT_DSN=amqp://guest:guest@rabbitmq:5672/%2f/messages
54+
#MESSENGER_TRANSPORT_DSN=amqp://guest:guest@rabbitmq:5672/%2f/messages
5755
###< symfony/messenger ###
5856

5957
###> symfony/lock ###

‎Dockerfile‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,16 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
3737
sudo \
3838
libzip-dev \
3939
wget \
40-
librabbitmq-dev \
41-
&&pecl installamqp \
42-
&& docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd \
40+
python3-pip \
41+
&&apt-get install-y libpq-dev \
42+
&& docker-php-ext-install pgsql pdo_pgsqlpdo \
4343
&& docker-php-ext-configure intl \
4444
&& docker-php-ext-install \
45-
pdo_mysql \
45+
pdo_pgsql \
4646
sockets \
4747
intl \
4848
opcache \
4949
zip \
50-
&& docker-php-ext-enable amqp \
5150
&& rm -rf /tmp/* \
5251
&& rm -rf /var/list/apt/* \
5352
&& rm -rf /var/lib/apt/lists/* \
@@ -115,4 +114,6 @@ RUN if [ "$BUILD_ARGUMENT_ENV" = "dev" ] || [ "$BUILD_ARGUMENT_ENV" = "test" ];
115114
RUN if ["$BUILD_ARGUMENT_ENV" ="staging" ] || ["$BUILD_ARGUMENT_ENV" ="prod" ]; then composer dump-env $BUILD_ARGUMENT_ENV; \
116115
fi
117116

118-
USER root
117+
RUN pip3 install epam.indigo --break-system-packages
118+
119+
USER root

‎Makefile‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -30,112 +30,112 @@ help: ## Shows available commands with description
3030

3131
build:## Build dev environment
3232
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
33-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG)MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE)docker-compose -f docker-compose.yml build
33+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) docker-compose -f docker-compose.yml build
3434
else
3535
$(ERROR_ONLY_FOR_HOST)
3636
endif
3737

3838
build-test:## Build test or continuous integration environment
3939
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
40-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG)MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE)docker-compose -f docker-compose-test-ci.yml build
40+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) docker-compose -f docker-compose-test-ci.yml build
4141
else
4242
$(ERROR_ONLY_FOR_HOST)
4343
endif
4444

4545
build-staging:## Build staging environment
4646
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
47-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL)MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE)docker-compose -f docker-compose-staging.yml build
47+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) docker-compose -f docker-compose-staging.yml build
4848
else
4949
$(ERROR_ONLY_FOR_HOST)
5050
endif
5151

5252
build-prod:## Build prod environment
5353
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
54-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL)MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE)docker-compose -f docker-compose-prod.yml build
54+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) docker-compose -f docker-compose-prod.yml build
5555
else
5656
$(ERROR_ONLY_FOR_HOST)
5757
endif
5858

5959
start:## Start dev environment
6060
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
61-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG)MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE)docker-compose -f docker-compose.yml $(PROJECT_NAME) up -d
61+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) docker-compose -f docker-compose.yml $(PROJECT_NAME) up -d
6262
else
6363
$(ERROR_ONLY_FOR_HOST)
6464
endif
6565

6666
start-test:## Start test or continuous integration environment
6767
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
68-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG)MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE)docker-compose -f docker-compose-test-ci.yml $(PROJECT_NAME) up -d
68+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) docker-compose -f docker-compose-test-ci.yml $(PROJECT_NAME) up -d
6969
else
7070
$(ERROR_ONLY_FOR_HOST)
7171
endif
7272

7373
start-staging:## Start staging environment
7474
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
75-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL)MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE)docker-compose -f docker-compose-staging.yml $(PROJECT_NAME) up -d
75+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) docker-compose -f docker-compose-staging.yml $(PROJECT_NAME) up -d
7676
else
7777
$(ERROR_ONLY_FOR_HOST)
7878
endif
7979

8080
start-prod:## Start prod environment
8181
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
82-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL)MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE)docker-compose -f docker-compose-prod.yml $(PROJECT_NAME) up -d
82+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) docker-compose -f docker-compose-prod.yml $(PROJECT_NAME) up -d
8383
else
8484
$(ERROR_ONLY_FOR_HOST)
8585
endif
8686

8787
stop:## Stop dev environment containers
8888
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
89-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG)MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE)docker-compose -f docker-compose.yml $(PROJECT_NAME) stop
89+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) docker-compose -f docker-compose.yml $(PROJECT_NAME) stop
9090
else
9191
$(ERROR_ONLY_FOR_HOST)
9292
endif
9393

9494
stop-test:## Stop test or continuous integration environment containers
9595
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
96-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG)MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE)docker-compose -f docker-compose-test-ci.yml $(PROJECT_NAME) stop
96+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) docker-compose -f docker-compose-test-ci.yml $(PROJECT_NAME) stop
9797
else
9898
$(ERROR_ONLY_FOR_HOST)
9999
endif
100100

101101
stop-staging:## Stop staging environment containers
102102
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
103-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL)MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE)docker-compose -f docker-compose-staging.yml $(PROJECT_NAME) stop
103+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) docker-compose -f docker-compose-staging.yml $(PROJECT_NAME) stop
104104
else
105105
$(ERROR_ONLY_FOR_HOST)
106106
endif
107107

108108
stop-prod:## Stop prod environment containers
109109
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
110-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL)MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE)docker-compose -f docker-compose-prod.yml $(PROJECT_NAME) stop
110+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) docker-compose -f docker-compose-prod.yml $(PROJECT_NAME) stop
111111
else
112112
$(ERROR_ONLY_FOR_HOST)
113113
endif
114114

115115
down:## Stop and remove dev environment containers, networks
116116
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
117-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG)MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE)docker-compose -f docker-compose.yml $(PROJECT_NAME) down
117+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) docker-compose -f docker-compose.yml $(PROJECT_NAME) down
118118
else
119119
$(ERROR_ONLY_FOR_HOST)
120120
endif
121121

122122
down-test:## Stop and remove test or continuous integration environment containers, networks
123123
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
124-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG)MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE)docker-compose -f docker-compose-test-ci.yml $(PROJECT_NAME) down
124+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) docker-compose -f docker-compose-test-ci.yml $(PROJECT_NAME) down
125125
else
126126
$(ERROR_ONLY_FOR_HOST)
127127
endif
128128

129129
down-staging:## Stop and remove staging environment containers, networks
130130
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
131-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL)MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE)docker-compose -f docker-compose-staging.yml $(PROJECT_NAME) down
131+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) docker-compose -f docker-compose-staging.yml $(PROJECT_NAME) down
132132
else
133133
$(ERROR_ONLY_FOR_HOST)
134134
endif
135135

136136
down-prod:## Stop and remove prod environment containers, networks
137137
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
138-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL)MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE)docker-compose -f docker-compose-prod.yml $(PROJECT_NAME) down
138+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) docker-compose -f docker-compose-prod.yml $(PROJECT_NAME) down
139139
else
140140
$(ERROR_ONLY_FOR_HOST)
141141
endif
@@ -153,35 +153,35 @@ env-staging: ## Creates cached config file .env.local.php (usually for staging e
153153

154154
ssh:## Get bash inside symfony docker container
155155
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
156-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG)MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE)docker-compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony bash
156+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) docker-compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony bash
157157
else
158158
$(ERROR_ONLY_FOR_HOST)
159159
endif
160160

161161
ssh-root:## Get bash as root user inside symfony docker container
162162
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
163-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG)MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE)docker-compose $(PROJECT_NAME) exec $(OPTION_T) symfony bash
163+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) docker-compose $(PROJECT_NAME) exec $(OPTION_T) symfony bash
164164
else
165165
$(ERROR_ONLY_FOR_HOST)
166166
endif
167167

168168
ssh-supervisord:## Get bash inside supervisord docker container (cron jobs running there, etc...)
169169
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
170-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG)MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE)docker-compose $(PROJECT_NAME) exec supervisord bash
170+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) docker-compose $(PROJECT_NAME) exec supervisord bash
171171
else
172172
$(ERROR_ONLY_FOR_HOST)
173173
endif
174174

175-
ssh-mysql:## Get bash inside mysql docker container
175+
ssh-pgsql:## Get bash inside mysql docker container
176176
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
177-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG)MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE)docker-compose $(PROJECT_NAME) execmysql bash
177+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) docker-compose $(PROJECT_NAME) execpgsql bash
178178
else
179179
$(ERROR_ONLY_FOR_HOST)
180180
endif
181181

182182
ssh-rabbitmq:## Get bash inside rabbitmq docker container
183183
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
184-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG)MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE)docker-compose $(PROJECT_NAME) exec rabbitmq /bin/sh
184+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) docker-compose $(PROJECT_NAME) exec rabbitmq /bin/sh
185185
else
186186
$(ERROR_ONLY_FOR_HOST)
187187
endif
@@ -190,19 +190,19 @@ exec:
190190
ifeq ($(INSIDE_DOCKER_CONTAINER), 1)
191191
@$$cmd
192192
else
193-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG)MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE)docker-compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony $$cmd
193+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) docker-compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony $$cmd
194194
endif
195195

196196
exec-bash:
197197
ifeq ($(INSIDE_DOCKER_CONTAINER), 1)
198198
@bash -c "$(cmd)"
199199
else
200-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG)MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE)docker-compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony bash -c "$(cmd)"
200+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) docker-compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony bash -c "$(cmd)"
201201
endif
202202

203203
exec-by-root:
204204
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
205-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG)MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE)docker-compose $(PROJECT_NAME) exec $(OPTION_T) symfony $$cmd
205+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) docker-compose $(PROJECT_NAME) exec $(OPTION_T) symfony $$cmd
206206
else
207207
$(ERROR_ONLY_FOR_HOST)
208208
endif
@@ -244,9 +244,9 @@ else
244244
$(ERROR_ONLY_FOR_HOST)
245245
endif
246246

247-
logs-mysql:## Shows logs from the mysql container. Use ctrl+c in order to exit
247+
logs-pgsql:## Shows logs from the mysql container. Use ctrl+c in order to exit
248248
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
249-
@docker logs -f ${COMPOSE_PROJECT_NAME}-mysql
249+
@docker logs -f ${COMPOSE_PROJECT_NAME}_pgsql_1
250250
else
251251
$(ERROR_ONLY_FOR_HOST)
252252
endif

‎composer.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,12 @@
2323
],
2424
"require": {
2525
"php":"^8.2.0",
26-
"ext-amqp":"*",
2726
"ext-ctype":"*",
2827
"ext-iconv":"*",
2928
"ext-json":"*",
3029
"ext-mbstring":"*",
3130
"ext-pdo":"*",
32-
"ext-pdo_mysql":"*",
31+
"ext-pdo_pgsql":"*",
3332
"doctrine/annotations":"^2.0",
3433
"doctrine/doctrine-bundle":"^2.10",
3534
"doctrine/doctrine-migrations-bundle":"^3.2",
@@ -49,7 +48,6 @@
4948
"symfony/intl":"6.3.*",
5049
"symfony/mailer":"6.3.*",
5150
"symfony/messenger":"6.3.*",
52-
"symfony/amqp-messenger":"6.3.*",
5351
"symfony/doctrine-messenger":"6.3.*",
5452
"symfony/mime":"6.3.*",
5553
"symfony/monolog-bundle":"^3.8",

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp