Skip to content

Commit

Permalink
try fix elk
Browse files Browse the repository at this point in the history
  • Loading branch information
bailletced committed Dec 3, 2024
1 parent 8a2327a commit 016f1e1
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
1 change: 0 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ PYTHONWARNINGS="ignore:Unverified HTTPS request"
###< synchro scripts ###

ELASTIC_PASSWORD=admin
ELASTICSEARCH_HOST=http://elasticsearch:9200
ELASTICSEARCH_IRI=https://elastic:admin@elasticsearch:9200
11 changes: 8 additions & 3 deletions .github/workflows/github-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@ jobs:
ports:
- 9200:9200
env:
ELASTIC_PASSWORD: admin
- ELASTIC_PASSWORD=admin
- discovery.type=single-node
- xpack.security.enabled=true
- ELASTIC_PASSWORD=admin
- bootstrap.memory_lock=true
- ES_JAVA_OPTS=-Xms512m -Xmx512m
options: --health-cmd="curl http://localhost:9200/_cluster/health" --health-interval=10s --health-timeout=5s --health-retries=3
steps:
- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand All @@ -36,8 +42,7 @@ jobs:
ini-values: date.timezone=Europe/Paris
- uses: actions/checkout@v4
- name: Create .env.test.local
# TODO remove LOCK_DSN on Symfony update
run: echo -e "DB_NAME_SUFFIX=\\ELASTICSEARCH_IRI=https://elastic:admin@elasticsearch:${{ job.services.elasticsearch.ports['9200'] }}" > .env.test.local
run: echo -e "DB_NAME_SUFFIX=\\ELASTICSEARCH_IRI=http://elastic:admin@elasticsearch:${{ job.services.elasticsearch.ports['9200'] }}" > .env.test.local
- name: Get composer cache directory
id: composer-cache
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
Expand Down
5 changes: 2 additions & 3 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,11 @@ services:
- xpack.security.enrollment.enabled=true
- bootstrap.memory_lock=true
- ES_JAVA_OPTS=-Xms512m -Xmx512m # 512mo HEAP
- ELASTIC_PASSWORD=admin
networks:
- app-network
ports:
- 9200:9200
volumes:
- ./elastic/data:/usr/share/elasticsearch/elastic/data

backend:
extra_hosts: *default-extra_hosts
Expand All @@ -61,7 +60,7 @@ services:
- app-network
environment:
SERVER_NAME: localhost api.openchurch.local admin.openchurch.local

DATABASE_URL: mysql://root:openchurch@db:3306/openchurch?serverVersion=11.5.2-MariaDB&charset=utf8mb4
volumes:
openchurch_db_data: {}

Expand Down
1 change: 1 addition & 0 deletions config/packages/doctrine.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ doctrine:

profiling_collect_backtrace: "%kernel.debug%"
use_savepoints: true
schema_filter: "~^(?!doctrine_migration_versions$)~"

types:
enum_reliability_type: App\Field\Domain\Enum\FieldReliability
Expand Down

0 comments on commit 016f1e1

Please sign in to comment.