diff --git a/.drone.yml b/.drone.yml index 3cb2872..ee100ea 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,7 +5,7 @@ steps: - name: install image: composer commands: - - composer install + - make install - name: cleanup image: php:8.1 commands: diff --git a/.env b/.env index 6fc0540..db1ad39 100644 --- a/.env +++ b/.env @@ -24,7 +24,7 @@ APP_SECRET=e5a2fe31ff8ce325266d52632a0ba5df # IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml # # DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db" -DATABASE_URL="mysql://root:geheim@127.0.0.1:3306/cds_connector?serverVersion=5.7&charset=utf8mb4" +DATABASE_URL="mysql://db:db@db:3306/db?serverVersion=mariadb-10.4.11&charset=utf8mb4" #DATABASE_URL="postgresql://symfony:ChangeMe@127.0.0.1:5432/app?serverVersion=13&charset=utf8" ###< doctrine/doctrine-bundle ### @@ -32,7 +32,7 @@ DATABASE_URL="mysql://root:geheim@127.0.0.1:3306/cds_connector?serverVersion=5.7 CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$' ###< nelmio/cors-bundle ### -SHOPWARE_API_URL="development.dev.localhost" -SHOPWARE_API_KEY="S2hySDNyZ214dGRVQmFBSURQbkRvajIyZldxOHB4RktZakxaYmo" -SHOPWARE_API_ID="SWUAB1JGAFHTMME5DUGWDWN1EQ" +SHOPWARE_API_URL="https://cycro.ddev.site" +SHOPWARE_API_KEY="SHVRaXVVNU1wVm8xWlBVclZiaTFrTkNtdkJDNng3cUFhZHhoZ3Y" +SHOPWARE_API_ID="SWIAB0HHT3NLBUDLEK1JY2J5RW" diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index 4f29a6f..ba91d1d 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -8,5 +8,14 @@ jdbc:mysql://127.0.0.1:3306 $ProjectFileDir$ + + mariadb + true + true + DDEV generated data source + org.mariadb.jdbc.Driver + jdbc:mariadb://127.0.0.1:60294/db?user=db&password=db + $ProjectFileDir$ + \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml index 96fe378..9efed86 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -142,6 +142,31 @@ + + + + + + + + + + + + + + + + + +