diff --git a/Dockerfile b/Dockerfile index e8cb6f0..3495401 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,16 +45,6 @@ COPY --chown=app:app tools/docker/images/php/root / ENTRYPOINT ["/usr/local/bin/docker-entrypoint-php"] CMD ["php-fpm"] -################################################################################ - -FROM base AS test - -COPY --chown=app:app . . - -RUN parallel-lint src --no-progress \ - && phpcs -vv \ - && phpstan \ - && phpunit --testdox diff --git a/docker-compose.yaml b/docker-compose.yaml index acf6c26..35cab1c 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -28,6 +28,14 @@ x-app: &default-app tty: true services: + web: + <<: [*default-proxy, *default-app] + build: + context: . + target: web + depends_on: + - php + profiles: [web] php: <<: *default-app @@ -38,8 +46,30 @@ services: - "DOCKER_UID=${DOCKER_UID:-1000}" volumes: - .:/app + depends_on: + - database profiles: [php] + database: + image: mariadb:10 + deploy: + resources: + limits: + cpus: "${DOCKER_MYSQL_CPUS:-0}" + memory: "${DOCKER_MYSQL_MEMORY:-0}" + volumes: + - db-data:/var/lib/mysql + + env_file: + - .env + labels: + - "traefik.enabled=false" + environment: + MYSQL_RANDOM_ROOT_PASSWORD: true + profiles: [database] + +volumes: + db-data: {} networks: web: name: traefik_proxy