diff --git a/.env b/.env index 8fc722d..40f9152 100644 --- a/.env +++ b/.env @@ -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 \ No newline at end of file diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index a77ed70..560587a 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -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 @@ -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 diff --git a/compose.yaml b/compose.yaml index ea5ab0d..4afda7e 100644 --- a/compose.yaml +++ b/compose.yaml @@ -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 @@ -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: {} diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml index 06b70a3..4136db4 100644 --- a/config/packages/doctrine.yaml +++ b/config/packages/doctrine.yaml @@ -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