From b359927080998d7265ca12cf4574844598c24717 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 27 Jun 2023 21:24:28 +0100 Subject: [PATCH] build-configs(update) --- .env.example | 2 +- Dockerfile | 4 ++-- docker-compose.yaml | 3 ++- justfile | 3 ++- phpcs.xml.dist | 2 +- phpstan.neon.dist | 2 +- phpunit.xml.dist | 2 +- .../images/php/root/usr/local/bin/docker-entrypoint-php | 2 +- tools/docker/images/php/root/usr/local/etc/php/php.ini | 2 +- tools/docker/images/web/root/etc/nginx/conf.d/default.conf | 2 +- 10 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.env.example b/.env.example index be25a42..54c1c13 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ -# Do not edit this file. It is automatically generated by https://oliverdavies.dev/build-configs. +# Do not edit this file. It is automatically generated by https://www.oliverdavies.uk/build-configs. export DOCKER_UID=1000 diff --git a/Dockerfile b/Dockerfile index e583bf6..d0551a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# Do not edit this file. It is automatically generated by https://oliverdavies.dev/build-configs. +# Do not edit this file. It is automatically generated by https://www.oliverdavies.uk/build-configs. FROM php:8.1-fpm-bullseye AS base @@ -28,7 +28,7 @@ USER root RUN apt-get update -yqq \ && apt-get install -yqq --no-install-recommends \ - git libjpeg-dev libpng-dev libzip-dev mariadb-client unzip + git libpng-dev libjpeg-dev libzip-dev mariadb-client unzip RUN docker-php-ext-configure gd --with-jpeg diff --git a/docker-compose.yaml b/docker-compose.yaml index abd47f4..7d125fe 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,4 +1,4 @@ -# Do not edit this file. It is automatically generated by https://oliverdavies.dev/build-configs. +# Do not edit this file. It is automatically generated by https://www.oliverdavies.uk/build-configs. x-proxy: &default-proxy networks: @@ -42,4 +42,5 @@ services: networks: web: + external: true name: traefik_proxy diff --git a/justfile b/justfile index 71420ec..d255f5d 100644 --- a/justfile +++ b/justfile @@ -1,4 +1,5 @@ -# Do not edit this file. It is automatically generated by https://oliverdavies.dev/build-configs. +# Do not edit this file. It is automatically generated by https://www.oliverdavies.uk/build-configs. + default: @just --list diff --git a/phpcs.xml.dist b/phpcs.xml.dist index a2eaa23..81bd8ac 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -1,5 +1,5 @@ - + PHPCS configuration file for docker-example-drupal-localgov. diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 0658052..bec183f 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -1,4 +1,4 @@ -# Do not edit this file. It is automatically generated by https://oliverdavies.dev/build-configs. +# Do not edit this file. It is automatically generated by https://www.oliverdavies.uk/build-configs. parameters: level: max diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 1dbab8f..179546d 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,5 +1,5 @@ - +