build-configs(update)
This commit is contained in:
parent
722b7710b4
commit
94fc447005
|
@ -29,7 +29,7 @@ RUN apt-get update -yqq \
|
|||
&& apt-get install -yqq --no-install-recommends \
|
||||
git libpng-dev libzip-dev mariadb-client unzip
|
||||
|
||||
RUN docker-php-ext-install gd pdo_mysql zip
|
||||
RUN docker-php-ext-install bcmath gd pdo_mysql zip
|
||||
|
||||
COPY --chown=app:app phpunit.xml* ./
|
||||
|
||||
|
|
|
@ -28,14 +28,6 @@ x-app: &default-app
|
|||
tty: true
|
||||
|
||||
services:
|
||||
web:
|
||||
<<: [*default-proxy, *default-app]
|
||||
build:
|
||||
context: .
|
||||
target: web
|
||||
depends_on:
|
||||
- php
|
||||
profiles: [web]
|
||||
|
||||
php:
|
||||
<<: *default-app
|
||||
|
@ -46,30 +38,8 @@ 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
|
||||
|
|
Loading…
Reference in a new issue