From 8115bc3dd1cd583d252b4edd4486120b5e7922fe Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 27 Jun 2023 21:21:55 +0100 Subject: [PATCH] build-configs(update) --- .env.example | 2 +- .githooks/pre-push | 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 +- 11 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.env.example b/.env.example index 91c5100..c8344a9 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/.githooks/pre-push b/.githooks/pre-push index fa8d10a..2233106 100755 --- a/.githooks/pre-push +++ b/.githooks/pre-push @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# 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. set -euo pipefail diff --git a/Dockerfile b/Dockerfile index 5c8d98d..500608d 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 47899e3..0961d4a 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: @@ -72,4 +72,5 @@ volumes: db-data: {} networks: web: + external: true name: traefik_proxy diff --git a/justfile b/justfile index 3d6c99f..bdefa3d 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 8562a39..1719372 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -1,5 +1,5 @@ - + PHPCS configuration file for docker-example-drupal. diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 5541438..a5a696c 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 @@ - +