Update build configuration files

This commit is contained in:
Oliver Davies 2024-05-10 23:55:28 +02:00
parent d6f8b29065
commit d57e91e567
3 changed files with 7 additions and 5 deletions

2
.gitignore vendored
View file

@ -3,6 +3,7 @@
.editorconfig .editorconfig
.env .env
.gitattributes .gitattributes
.phpunit.result.cache
vendor/ vendor/
web/.csslintrc web/.csslintrc
web/.eslintignore web/.eslintignore
@ -39,4 +40,3 @@ web/web.config
.env .env
docker-compose.override.yaml docker-compose.override.yaml

View file

@ -34,7 +34,7 @@ RUN apt-get update -yqq \
RUN docker-php-ext-configure gd --with-jpeg RUN docker-php-ext-configure gd --with-jpeg
RUN docker-php-ext-install gd pdo_mysql zip RUN docker-php-ext-install gd opcache pdo_mysql zip
COPY --chown=app:app phpunit.xml* ./ COPY --chown=app:app phpunit.xml* ./

View file

@ -5,10 +5,12 @@ x-proxy: &default-proxy
- default - default
- web - web
labels: labels:
- "traefik.enable=true"
- "traefik.docker.network=traefik_proxy" - "traefik.docker.network=traefik_proxy"
- "traefik.http.routers.${COMPOSE_PROJECT_NAME}.rule=Host( - "traefik.http.routers.${COMPOSE_PROJECT_NAME}.rule=Host(
`${COMPOSE_PROJECT_NAME}.localhost`, `${COMPOSE_PROJECT_NAME}.docker.localhost`,
)" )"
- "traefik.http.routers.${COMPOSE_PROJECT_NAME}.tls=true"
x-app: &default-app x-app: &default-app
volumes: volumes:
@ -24,7 +26,7 @@ x-app: &default-app
cpus: "${DOCKER_MYSQL_CPUS:-0}" cpus: "${DOCKER_MYSQL_CPUS:-0}"
memory: "${DOCKER_MYSQL_MEMORY:-0}" memory: "${DOCKER_MYSQL_MEMORY:-0}"
labels: labels:
- "traefik.enabled=false" - "traefik.enable=false"
tty: true tty: true
services: services:
@ -63,7 +65,7 @@ services:
env_file: env_file:
- .env - .env
labels: labels:
- "traefik.enabled=false" - "traefik.enable=false"
environment: environment:
MYSQL_RANDOM_ROOT_PASSWORD: true MYSQL_RANDOM_ROOT_PASSWORD: true
profiles: [database] profiles: [database]