From d5868b88c43cec0ea63d1256d712d0580b62323e Mon Sep 17 00:00:00 2001 From: Guillaume KESTEMAN Date: Tue, 12 Jul 2022 16:09:52 +0200 Subject: [PATCH] Create one directory for api to separate api files and admin files --- .gitignore | 45 ++++-------------- Makefile | 6 +-- README.md | 4 +- {my-admin => admin}/.gitignore | 0 {my-admin => admin}/README.md | 0 {my-admin => admin}/package-lock.json | 4 +- {my-admin => admin}/package.json | 2 +- {my-admin => admin}/public/favicon.ico | Bin {my-admin => admin}/public/index.html | 0 {my-admin => admin}/public/logo192.png | Bin {my-admin => admin}/public/logo512.png | Bin {my-admin => admin}/public/manifest.json | 0 {my-admin => admin}/public/robots.txt | 0 {my-admin => admin}/src/App.css | 0 {my-admin => admin}/src/App.js | 0 {my-admin => admin}/src/App.test.js | 0 {my-admin => admin}/src/config/entrypoint.ts | 0 {my-admin => admin}/src/index.css | 0 {my-admin => admin}/src/index.js | 0 {my-admin => admin}/src/logo.svg | 0 {my-admin => admin}/src/reportWebVitals.js | 0 {my-admin => admin}/src/setupTests.js | 0 .../src/utils/authProvider.tsx | 0 {my-admin => admin}/yarn.lock | 0 .dockerignore => api/.dockerignore | 0 .env => api/.env | 0 .env.test => api/.env.test | 0 api/.gitignore | 44 +++++++++++++++++ Dockerfile => api/Dockerfile | 9 ++-- {bin => api/bin}/console | 4 +- api/bin/phpunit | 19 ++++++++ composer.json => api/composer.json | 0 composer.lock => api/composer.lock | 0 {config => api/config}/bundles.php | 0 .../config}/packages/api_platform.yaml | 0 {config => api/config}/packages/cache.yaml | 0 {config => api/config}/packages/debug.yaml | 0 {config => api/config}/packages/doctrine.yaml | 0 .../config}/packages/doctrine_migrations.yaml | 0 .../config}/packages/framework.yaml | 0 .../packages/lexik_jwt_authentication.yaml | 0 {config => api/config}/packages/mailer.yaml | 0 .../config}/packages/messenger.yaml | 0 {config => api/config}/packages/monolog.yaml | 0 .../config}/packages/nelmio_cors.yaml | 0 {config => api/config}/packages/notifier.yaml | 0 {config => api/config}/packages/routing.yaml | 0 {config => api/config}/packages/security.yaml | 0 .../packages/sensio_framework_extra.yaml | 0 .../config}/packages/translation.yaml | 0 {config => api/config}/packages/twig.yaml | 0 .../config}/packages/validator.yaml | 0 .../config}/packages/vich_uploader.yaml | 0 .../config}/packages/web_profiler.yaml | 0 .../config}/packages/zenstruck_foundry.yaml | 0 {config => api/config}/preload.php | 0 {config => api/config}/routes.yaml | 0 .../config}/routes/api_platform.yaml | 0 {config => api/config}/routes/framework.yaml | 0 .../config}/routes/web_profiler.yaml | 0 {config => api/config}/services.yaml | 0 {docker => api/docker}/caddy/Caddyfile | 2 +- .../docker}/php/conf.d/symfony.dev.ini | 0 .../docker}/php/conf.d/symfony.prod.ini | 2 +- .../docker}/php/docker-entrypoint.sh | 0 .../docker}/php/docker-healthcheck.sh | 0 .../docker}/php/php-fpm.d/zz-docker.conf | 0 {docs => api/docs}/build.md | 0 {docs => api/docs}/digitalocean-droplet.png | Bin {docs => api/docs}/existing-project.md | 0 {docs => api/docs}/extra-services.md | 0 {docs => api/docs}/gandi-dns.png | Bin {docs => api/docs}/makefile.md | 2 +- {docs => api/docs}/production.md | 0 {docs => api/docs}/troubleshooting.md | 0 {docs => api/docs}/xdebug.md | 2 +- {migrations => api/migrations}/.gitignore | 0 .../migrations}/Version20220627150954.php | 0 .../migrations}/Version20220628074706.php | 0 .../migrations}/Version20220628132446.php | 0 .../migrations}/Version20220629082005.php | 0 .../migrations}/Version20220630122415.php | 0 .../migrations}/Version20220630122942.php | 0 .../migrations}/Version20220630125001.php | 0 .../migrations}/Version20220630132841.php | 0 .../migrations}/Version20220630134922.php | 0 .../migrations}/Version20220630140850.php | 0 .../migrations}/Version20220630150755.php | 0 .../migrations}/Version20220704122354.php | 0 .../migrations}/Version20220704123324.php | 0 .../migrations}/Version20220704124814.php | 0 .../migrations}/Version20220704125814.php | 0 .../migrations}/Version20220704134720.php | 0 .../migrations}/Version20220705131422.php | 0 phpunit.xml.dist => api/phpunit.xml.dist | 2 +- {public => api/public}/.gitignore | 0 {public => api/public}/index.php | 2 +- .../Command/TwitterApiRecentTweetsCommand.php | 0 {src => api/src}/Controller/.gitignore | 0 .../CreateMediaObjectActionController.php | 0 {src => api/src}/DataFixtures/AppFixtures.php | 0 {src => api/src}/Entity/.gitignore | 0 {src => api/src}/Entity/Game.php | 0 {src => api/src}/Entity/Lot.php | 0 {src => api/src}/Entity/MediaObject.php | 0 {src => api/src}/Entity/Player.php | 0 {src => api/src}/Entity/Reward.php | 0 {src => api/src}/Entity/Tweet.php | 0 {src => api/src}/Entity/User.php | 0 {src => api/src}/Factory/GameFactory.php | 0 {src => api/src}/Factory/LotFactory.php | 0 {src => api/src}/Factory/PlayerFactory.php | 0 {src => api/src}/Factory/RewardFactory.php | 0 {src => api/src}/Factory/TweetFactory.php | 0 {src => api/src}/Factory/UserFactory.php | 0 {src => api/src}/Kernel.php | 0 {src => api/src}/Repository/.gitignore | 0 .../src}/Repository/GameRepository.php | 0 {src => api/src}/Repository/LotRepository.php | 0 .../src}/Repository/MediaObjectRepository.php | 0 .../src}/Repository/PlayerRepository.php | 0 .../src}/Repository/RewardRepository.php | 0 .../src}/Repository/TweetRepository.php | 0 .../src}/Repository/UserRepository.php | 0 .../src}/Serializer/MediaObjectNormalizer.php | 0 {src => api/src}/TwitterApiService.php | 0 symfony.lock => api/symfony.lock | 0 {templates => api/templates}/base.html.twig | 0 .../index.html.twig | 2 +- api/tests/bootstrap.php | 11 +++++ {translations => api/translations}/.gitignore | 0 yarn.lock => api/yarn.lock | 0 bin/phpunit | 19 -------- docker-compose.override.yml | 10 ++-- docker-compose.yml | 8 +++- tests/bootstrap.php | 11 ----- 136 files changed, 116 insertions(+), 94 deletions(-) rename {my-admin => admin}/.gitignore (100%) rename {my-admin => admin}/README.md (100%) rename {my-admin => admin}/package-lock.json (99%) rename {my-admin => admin}/package.json (97%) rename {my-admin => admin}/public/favicon.ico (100%) rename {my-admin => admin}/public/index.html (100%) rename {my-admin => admin}/public/logo192.png (100%) rename {my-admin => admin}/public/logo512.png (100%) rename {my-admin => admin}/public/manifest.json (100%) rename {my-admin => admin}/public/robots.txt (100%) rename {my-admin => admin}/src/App.css (100%) rename {my-admin => admin}/src/App.js (100%) rename {my-admin => admin}/src/App.test.js (100%) rename {my-admin => admin}/src/config/entrypoint.ts (100%) rename {my-admin => admin}/src/index.css (100%) rename {my-admin => admin}/src/index.js (100%) rename {my-admin => admin}/src/logo.svg (100%) rename {my-admin => admin}/src/reportWebVitals.js (100%) rename {my-admin => admin}/src/setupTests.js (100%) rename {my-admin => admin}/src/utils/authProvider.tsx (100%) rename {my-admin => admin}/yarn.lock (100%) rename .dockerignore => api/.dockerignore (100%) rename .env => api/.env (100%) rename .env.test => api/.env.test (100%) create mode 100644 api/.gitignore rename Dockerfile => api/Dockerfile (96%) rename {bin => api/bin}/console (73%) create mode 100755 api/bin/phpunit rename composer.json => api/composer.json (100%) rename composer.lock => api/composer.lock (100%) rename {config => api/config}/bundles.php (100%) rename {config => api/config}/packages/api_platform.yaml (100%) rename {config => api/config}/packages/cache.yaml (100%) rename {config => api/config}/packages/debug.yaml (100%) rename {config => api/config}/packages/doctrine.yaml (100%) rename {config => api/config}/packages/doctrine_migrations.yaml (100%) rename {config => api/config}/packages/framework.yaml (100%) rename {config => api/config}/packages/lexik_jwt_authentication.yaml (100%) rename {config => api/config}/packages/mailer.yaml (100%) rename {config => api/config}/packages/messenger.yaml (100%) rename {config => api/config}/packages/monolog.yaml (100%) rename {config => api/config}/packages/nelmio_cors.yaml (100%) rename {config => api/config}/packages/notifier.yaml (100%) rename {config => api/config}/packages/routing.yaml (100%) rename {config => api/config}/packages/security.yaml (100%) rename {config => api/config}/packages/sensio_framework_extra.yaml (100%) rename {config => api/config}/packages/translation.yaml (100%) rename {config => api/config}/packages/twig.yaml (100%) rename {config => api/config}/packages/validator.yaml (100%) rename {config => api/config}/packages/vich_uploader.yaml (100%) rename {config => api/config}/packages/web_profiler.yaml (100%) rename {config => api/config}/packages/zenstruck_foundry.yaml (100%) rename {config => api/config}/preload.php (100%) rename {config => api/config}/routes.yaml (100%) rename {config => api/config}/routes/api_platform.yaml (100%) rename {config => api/config}/routes/framework.yaml (100%) rename {config => api/config}/routes/web_profiler.yaml (100%) rename {config => api/config}/services.yaml (100%) rename {docker => api/docker}/caddy/Caddyfile (97%) rename {docker => api/docker}/php/conf.d/symfony.dev.ini (100%) rename {docker => api/docker}/php/conf.d/symfony.prod.ini (89%) rename {docker => api/docker}/php/docker-entrypoint.sh (100%) rename {docker => api/docker}/php/docker-healthcheck.sh (100%) rename {docker => api/docker}/php/php-fpm.d/zz-docker.conf (100%) rename {docs => api/docs}/build.md (100%) rename {docs => api/docs}/digitalocean-droplet.png (100%) rename {docs => api/docs}/existing-project.md (100%) rename {docs => api/docs}/extra-services.md (100%) rename {docs => api/docs}/gandi-dns.png (100%) rename {docs => api/docs}/makefile.md (99%) rename {docs => api/docs}/production.md (100%) rename {docs => api/docs}/troubleshooting.md (100%) rename {docs => api/docs}/xdebug.md (98%) rename {migrations => api/migrations}/.gitignore (100%) rename {migrations => api/migrations}/Version20220627150954.php (100%) rename {migrations => api/migrations}/Version20220628074706.php (100%) rename {migrations => api/migrations}/Version20220628132446.php (100%) rename {migrations => api/migrations}/Version20220629082005.php (100%) rename {migrations => api/migrations}/Version20220630122415.php (100%) rename {migrations => api/migrations}/Version20220630122942.php (100%) rename {migrations => api/migrations}/Version20220630125001.php (100%) rename {migrations => api/migrations}/Version20220630132841.php (100%) rename {migrations => api/migrations}/Version20220630134922.php (100%) rename {migrations => api/migrations}/Version20220630140850.php (100%) rename {migrations => api/migrations}/Version20220630150755.php (100%) rename {migrations => api/migrations}/Version20220704122354.php (100%) rename {migrations => api/migrations}/Version20220704123324.php (100%) rename {migrations => api/migrations}/Version20220704124814.php (100%) rename {migrations => api/migrations}/Version20220704125814.php (100%) rename {migrations => api/migrations}/Version20220704134720.php (100%) rename {migrations => api/migrations}/Version20220705131422.php (100%) rename phpunit.xml.dist => api/phpunit.xml.dist (94%) rename {public => api/public}/.gitignore (100%) rename {public => api/public}/index.php (68%) rename {src => api/src}/Command/TwitterApiRecentTweetsCommand.php (100%) rename {src => api/src}/Controller/.gitignore (100%) rename {src => api/src}/Controller/CreateMediaObjectActionController.php (100%) rename {src => api/src}/DataFixtures/AppFixtures.php (100%) rename {src => api/src}/Entity/.gitignore (100%) rename {src => api/src}/Entity/Game.php (100%) rename {src => api/src}/Entity/Lot.php (100%) rename {src => api/src}/Entity/MediaObject.php (100%) rename {src => api/src}/Entity/Player.php (100%) rename {src => api/src}/Entity/Reward.php (100%) rename {src => api/src}/Entity/Tweet.php (100%) rename {src => api/src}/Entity/User.php (100%) rename {src => api/src}/Factory/GameFactory.php (100%) rename {src => api/src}/Factory/LotFactory.php (100%) rename {src => api/src}/Factory/PlayerFactory.php (100%) rename {src => api/src}/Factory/RewardFactory.php (100%) rename {src => api/src}/Factory/TweetFactory.php (100%) rename {src => api/src}/Factory/UserFactory.php (100%) rename {src => api/src}/Kernel.php (100%) rename {src => api/src}/Repository/.gitignore (100%) rename {src => api/src}/Repository/GameRepository.php (100%) rename {src => api/src}/Repository/LotRepository.php (100%) rename {src => api/src}/Repository/MediaObjectRepository.php (100%) rename {src => api/src}/Repository/PlayerRepository.php (100%) rename {src => api/src}/Repository/RewardRepository.php (100%) rename {src => api/src}/Repository/TweetRepository.php (100%) rename {src => api/src}/Repository/UserRepository.php (100%) rename {src => api/src}/Serializer/MediaObjectNormalizer.php (100%) rename {src => api/src}/TwitterApiService.php (100%) rename symfony.lock => api/symfony.lock (100%) rename {templates => api/templates}/base.html.twig (100%) rename {templates => api/templates}/create_media_object_action/index.html.twig (96%) create mode 100644 api/tests/bootstrap.php rename {translations => api/translations}/.gitignore (100%) rename yarn.lock => api/yarn.lock (100%) delete mode 100755 bin/phpunit delete mode 100644 tests/bootstrap.php diff --git a/.gitignore b/.gitignore index 8ba40c4..0585b44 100644 --- a/.gitignore +++ b/.gitignore @@ -1,44 +1,17 @@ +/.env +/helm/api-platform/charts/* +!/helm/api-platform/charts/.gitignore +/docker-compose.override.yml +!/docker-compose.override.yml.dist + +###> phpstorm ### +/.idea +###< phpstorm ### ###> symfony/framework-bundle ### /.env.local /.env.local.php /.env.*.local -/config/secrets/prod/prod.decrypt.private.php -/public/bundles/ /var/ /vendor/ ###< symfony/framework-bundle ### - -###> phpunit/phpunit ### -/phpunit.xml -.phpunit.result.cache -###< phpunit/phpunit ### - -###> symfony/phpunit-bridge ### -.phpunit.result.cache -/phpunit.xml -###< symfony/phpunit-bridge ### - -###> symfony/webpack-encore-bundle ### -/node_modules/ -/public/build/ -npm-debug.log -yarn-error.log -###< symfony/webpack-encore-bundle ### - -###> phpstorm ### -/.idea -###< phpstorm ### - -###> lexik/jwt-authentication-bundle ### -/config/jwt/*.pem -###< lexik/jwt-authentication-bundle ### - -###> public/media ### -/public/media/ -###< public/media ### - -###> controller/testcontroller ### -/src/Controller/TestController.php -/templates/test -###< controller/testcontroller ### \ No newline at end of file diff --git a/Makefile b/Makefile index 8fe4995..388c126 100644 --- a/Makefile +++ b/Makefile @@ -8,17 +8,17 @@ start-all: docker-compose exec php bin/console doctrine:migrations:migrate --no-interaction docker-compose exec php bin/console doctrine:fixtures:load --no-interaction sleep 5 - cd my-admin/ && yarn start + cd admin/ && yarn start stop-all: docker-compose down install: - mkdir -p public/media + mkdir -p api/public/media sudo chown -R $(user):docker . chmod -R g+w . docker-compose build --pull --no-cache - cd my-admin/ && yarn install + cd admin/ && yarn install kill-docker-builds: docker-compose stop && docker-compose kill && docker-compose down --volumes --remove-orphans diff --git a/README.md b/README.md index 1f08811..b86eba4 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ or - Build docker with `docker-compose build --pull --no-cache` -- Go to the directory `my-admin/` and install the admin panel dependencies with `yarn install` +- Go to the directory `admin/` and install the admin panel dependencies with `yarn install` #### Generate JWT keypair : - Generate JWT keypair with this command : `php bin/console lexik:jwt:generate-keypair` @@ -18,7 +18,7 @@ or - Open a terminal in the root and launch this command : `docker-compose up -d` - Initialize the database with : `docker-compose exec php bin/console doctrine:fixtures:load` -- And go to the `my-admin/` directory and launch this command : `yarn start` +- And go to the `admin/` directory and launch this command : `yarn start` ### Project Stop : - Terminate the command `make`/`make start`/`yarn start` diff --git a/my-admin/.gitignore b/admin/.gitignore similarity index 100% rename from my-admin/.gitignore rename to admin/.gitignore diff --git a/my-admin/README.md b/admin/README.md similarity index 100% rename from my-admin/README.md rename to admin/README.md diff --git a/my-admin/package-lock.json b/admin/package-lock.json similarity index 99% rename from my-admin/package-lock.json rename to admin/package-lock.json index 8782939..c466093 100644 --- a/my-admin/package-lock.json +++ b/admin/package-lock.json @@ -1,11 +1,11 @@ { - "name": "my-admin", + "name": "admin", "version": "0.1.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "my-admin", + "name": "admin", "version": "0.1.0", "dependencies": { "@api-platform/admin": "^3.2.0", diff --git a/my-admin/package.json b/admin/package.json similarity index 97% rename from my-admin/package.json rename to admin/package.json index 2e399a8..794cd93 100644 --- a/my-admin/package.json +++ b/admin/package.json @@ -1,5 +1,5 @@ { - "name": "my-admin", + "name": "admin", "version": "0.1.0", "private": true, "dependencies": { diff --git a/my-admin/public/favicon.ico b/admin/public/favicon.ico similarity index 100% rename from my-admin/public/favicon.ico rename to admin/public/favicon.ico diff --git a/my-admin/public/index.html b/admin/public/index.html similarity index 100% rename from my-admin/public/index.html rename to admin/public/index.html diff --git a/my-admin/public/logo192.png b/admin/public/logo192.png similarity index 100% rename from my-admin/public/logo192.png rename to admin/public/logo192.png diff --git a/my-admin/public/logo512.png b/admin/public/logo512.png similarity index 100% rename from my-admin/public/logo512.png rename to admin/public/logo512.png diff --git a/my-admin/public/manifest.json b/admin/public/manifest.json similarity index 100% rename from my-admin/public/manifest.json rename to admin/public/manifest.json diff --git a/my-admin/public/robots.txt b/admin/public/robots.txt similarity index 100% rename from my-admin/public/robots.txt rename to admin/public/robots.txt diff --git a/my-admin/src/App.css b/admin/src/App.css similarity index 100% rename from my-admin/src/App.css rename to admin/src/App.css diff --git a/my-admin/src/App.js b/admin/src/App.js similarity index 100% rename from my-admin/src/App.js rename to admin/src/App.js diff --git a/my-admin/src/App.test.js b/admin/src/App.test.js similarity index 100% rename from my-admin/src/App.test.js rename to admin/src/App.test.js diff --git a/my-admin/src/config/entrypoint.ts b/admin/src/config/entrypoint.ts similarity index 100% rename from my-admin/src/config/entrypoint.ts rename to admin/src/config/entrypoint.ts diff --git a/my-admin/src/index.css b/admin/src/index.css similarity index 100% rename from my-admin/src/index.css rename to admin/src/index.css diff --git a/my-admin/src/index.js b/admin/src/index.js similarity index 100% rename from my-admin/src/index.js rename to admin/src/index.js diff --git a/my-admin/src/logo.svg b/admin/src/logo.svg similarity index 100% rename from my-admin/src/logo.svg rename to admin/src/logo.svg diff --git a/my-admin/src/reportWebVitals.js b/admin/src/reportWebVitals.js similarity index 100% rename from my-admin/src/reportWebVitals.js rename to admin/src/reportWebVitals.js diff --git a/my-admin/src/setupTests.js b/admin/src/setupTests.js similarity index 100% rename from my-admin/src/setupTests.js rename to admin/src/setupTests.js diff --git a/my-admin/src/utils/authProvider.tsx b/admin/src/utils/authProvider.tsx similarity index 100% rename from my-admin/src/utils/authProvider.tsx rename to admin/src/utils/authProvider.tsx diff --git a/my-admin/yarn.lock b/admin/yarn.lock similarity index 100% rename from my-admin/yarn.lock rename to admin/yarn.lock diff --git a/.dockerignore b/api/.dockerignore similarity index 100% rename from .dockerignore rename to api/.dockerignore diff --git a/.env b/api/.env similarity index 100% rename from .env rename to api/.env diff --git a/.env.test b/api/.env.test similarity index 100% rename from .env.test rename to api/.env.test diff --git a/api/.gitignore b/api/.gitignore new file mode 100644 index 0000000..e88452b --- /dev/null +++ b/api/.gitignore @@ -0,0 +1,44 @@ + +###> symfony/framework-bundle ### +/.env.local +/.env.local.php +/.env.*.local +/config/secrets/prod/prod.decrypt.private.php +/public/bundles/ +/var/ +/vendor/ +###< symfony/framework-bundle ### + +###> phpunit/phpunit ### +/phpunit.xml +.phpunit.result.cache +###< phpunit/phpunit ### + +###> symfony/phpunit-bridge ### +.phpunit.result.cache +/phpunit.xml +###< symfony/phpunit-bridge ### + +###> symfony/webpack-encore-bundle ### +/node_modules/ +/public/build/ +npm-debug.log +yarn-error.log +###< symfony/webpack-encore-bundle ### + +###> phpstorm ### +/.idea +###< phpstorm ### + +###> lexik/jwt-authentication-bundle ### +/config/jwt/*.pem +###< lexik/jwt-authentication-bundle ### + +###> public/media ### +/public/media/ +###< public/media ### + +###> controller/testcontroller ### +/src/Controller/TestController.php +/templates/test +###< controller/testcontroller ### diff --git a/Dockerfile b/api/Dockerfile similarity index 96% rename from Dockerfile rename to api/Dockerfile index 4a0e791..eefba15 100644 --- a/Dockerfile +++ b/api/Dockerfile @@ -75,7 +75,7 @@ ENV COMPOSER_ALLOW_SUPERUSER=1 ENV PATH="${PATH}:/root/.composer/vendor/bin" -WORKDIR /srv/app +WORKDIR /srv/api # Allow to choose skeleton ARG SKELETON="symfony/skeleton" @@ -111,7 +111,8 @@ RUN set -eux; \ composer symfony:dump-env prod; \ composer run-script --no-dev post-install-cmd; \ chmod +x bin/console; sync -VOLUME /srv/app/var +VOLUME /srv/api/var +VOLUME /srv/api/config/jwt ENTRYPOINT ["docker-entrypoint"] CMD ["php-fpm"] @@ -126,9 +127,9 @@ RUN xcaddy build \ FROM caddy:${CADDY_VERSION} AS symfony_caddy -WORKDIR /srv/app +WORKDIR /srv/api COPY --from=dunglas/mercure:v0.11 /srv/public /srv/mercure-assets/ COPY --from=symfony_caddy_builder /usr/bin/caddy /usr/bin/caddy -COPY --from=symfony_php /srv/app/public public/ +COPY --from=symfony_php /srv/api/public public/ COPY docker/caddy/Caddyfile /etc/caddy/Caddyfile diff --git a/bin/console b/api/bin/console similarity index 73% rename from bin/console rename to api/bin/console index c933dc5..5f36aff 100755 --- a/bin/console +++ b/api/bin/console @@ -4,11 +4,11 @@ use App\Kernel; use Symfony\Bundle\FrameworkBundle\Console\Application; -if (!is_file(dirname(__DIR__).'/vendor/autoload_runtime.php')) { +if (!is_file(dirname(__DIR__) . '/vendor/autoload_runtime.php')) { throw new LogicException('Symfony Runtime is missing. Try running "composer require symfony/runtime".'); } -require_once dirname(__DIR__).'/vendor/autoload_runtime.php'; +require_once dirname(__DIR__) . '/vendor/autoload_runtime.php'; return function (array $context) { $kernel = new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']); diff --git a/api/bin/phpunit b/api/bin/phpunit new file mode 100755 index 0000000..afd1b0e --- /dev/null +++ b/api/bin/phpunit @@ -0,0 +1,19 @@ +#!/usr/bin/env php + bootEnv(dirname(__DIR__) . '/.env'); +} diff --git a/translations/.gitignore b/api/translations/.gitignore similarity index 100% rename from translations/.gitignore rename to api/translations/.gitignore diff --git a/yarn.lock b/api/yarn.lock similarity index 100% rename from yarn.lock rename to api/yarn.lock diff --git a/bin/phpunit b/bin/phpunit deleted file mode 100755 index f26f2c7..0000000 --- a/bin/phpunit +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env php - symfony/mercure-bundle ### ###< symfony/mercure-bundle ### diff --git a/docker-compose.yml b/docker-compose.yml index b570b48..ff2d953 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.4" services: php: build: - context: . + context: ./api target: symfony_php args: SYMFONY_VERSION: ${SYMFONY_VERSION:-} @@ -12,6 +12,8 @@ services: restart: unless-stopped volumes: - php_socket:/var/run/php + - ./api:/srv/api:rw,cached + - ./api/var:/srv/api/var:rw healthcheck: interval: 10s timeout: 3s @@ -28,7 +30,7 @@ services: caddy: build: - context: . + context: api/ target: symfony_caddy depends_on: - php @@ -41,6 +43,8 @@ services: - php_socket:/var/run/php - caddy_data:/data - caddy_config:/config + - ./api/docker/caddy/Caddyfile:/etc/caddy/Caddyfile:ro + - ./api/public:/srv/api/public:ro ports: # HTTP - target: 80 diff --git a/tests/bootstrap.php b/tests/bootstrap.php deleted file mode 100644 index 469dcce..0000000 --- a/tests/bootstrap.php +++ /dev/null @@ -1,11 +0,0 @@ -bootEnv(dirname(__DIR__).'/.env'); -}