Skip to content

Commit 2114a48

Browse files
author
DKravtsov
committed
updated xdebug, elastic, bundles
1 parent b3acf57 commit 2114a48

35 files changed

+2667
-2755
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ MESSENGER_TRANSPORT_DSN=amqp://guest:guest@rabbitmq:5672/%2f/messages
4545
###< symfony/messenger ###
4646

4747
###> Elasticsearch configuration ###
48-
ELK_VERSION=7.8.0
48+
ELK_VERSION=7.10.1
4949
ELASTICSEARCH_HOST=http://elasticsearch:9200
5050
ELASTICSEARCH_NUMBER_OF_SHARDS=1
5151
ELASTICSEARCH_NUMBER_OF_REPLICAS=0

Dockerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
3030
supervisor \
3131
cron \
3232
libzip-dev \
33+
wget \
3334
librabbitmq-dev \
3435
&& pecl install amqp \
3536
&& docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd \
@@ -61,6 +62,10 @@ COPY ./docker/general/do_we_need_xdebug.sh /tmp/
6162
COPY ./docker/dev/xdebug.ini /tmp/
6263
RUN chmod u+x /tmp/do_we_need_xdebug.sh && /tmp/do_we_need_xdebug.sh
6364

65+
# install security-checker in case dev/test environment
66+
COPY ./docker/general/do_we_need_security-checker.sh /tmp/
67+
RUN chmod u+x /tmp/do_we_need_security-checker.sh && /tmp/do_we_need_security-checker.sh
68+
6469
# install composer
6570
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
6671
RUN chmod +x /usr/bin/composer

composer.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
"ext-pdo": "*",
3434
"ext-pdo_mysql": "*",
3535
"ext-amqp": "*",
36-
"antishov/doctrine-extensions-bundle": "^1.4",
36+
"stof/doctrine-extensions-bundle": "^1.5",
3737
"beberlei/doctrineextensions": "^1.3",
3838
"doctrine/doctrine-migrations-bundle": "^3.0",
39-
"easycorp/easy-log-handler": "1.0.*",
39+
"systemsdk/easy-log-bundle": "1.10.*",
4040
"elasticsearch/elasticsearch": "^7.10",
4141
"jmose/command-scheduler-bundle": "^3.0",
4242
"lexik/jwt-authentication-bundle": "^2.10",
@@ -88,7 +88,6 @@
8888
"doctrine/doctrine-fixtures-bundle": "^3.4",
8989
"ergebnis/composer-normalize": "^2.13",
9090
"roave/security-advisories": "dev-master",
91-
"sensiolabs/security-checker": "^6.0",
9291
"symfony/debug-bundle": "4.4.*",
9392
"symfony/maker-bundle": "^1.26",
9493
"symfony/requirements-checker": "^2.0",
@@ -136,14 +135,14 @@
136135
"scripts": {
137136
"post-install-cmd": [
138137
"if test -d vendor/symfony/requirements-checker; then ./vendor/bin/requirements-checker; fi",
139-
"if test -d vendor/sensiolabs/security-checker; then ./vendor/bin/security-checker security:check; fi",
140138
"if test -d vendor/bamarni/composer-bin-plugin; then composer bin all install; fi",
139+
"if which local-php-security-checker; then local-php-security-checker --update-cache && local-php-security-checker; fi",
141140
"@auto-scripts"
142141
],
143142
"post-update-cmd": [
144143
"if test -d vendor/symfony/requirements-checker; then ./vendor/bin/requirements-checker; fi",
145-
"if test -d vendor/sensiolabs/security-checker; then ./vendor/bin/security-checker security:check; fi",
146144
"if test -d vendor/bamarni/composer-bin-plugin; then composer bin all update; fi",
145+
"if which local-php-security-checker; then local-php-security-checker --update-cache && local-php-security-checker; fi",
147146
"@auto-scripts"
148147
],
149148
"auto-scripts": {

0 commit comments

Comments
 (0)