From 17c5703d2960a992d9bcdf50d1a33320c90df9c2 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 3 Mar 2023 19:36:19 +0000 Subject: [PATCH 01/65] feat: add Drupal LocalGov example --- .env.example | 10 + .github/workflows/test.yml | 175 ++++ .gitignore | 79 ++ Dockerfile | 65 ++ LICENSE | 339 ++++++++ README.md | 22 + assets/composer/development.services.yml | 13 + assets/composer/settings.php | 765 ++++++++++++++++++ build.yaml | 53 ++ composer.json | 81 ++ config/sync/.htaccess | 27 + docker-compose.yaml | 66 ++ justfile | 19 + phpcs.xml.dist | 7 + phpstan.neon | 12 + phpstan.neon.dist | 5 + phpunit.xml.dist | 37 + .../root/usr/local/bin/docker-entrypoint-php | 5 + .../web/root/etc/nginx/conf.d/default.conf | 20 + 19 files changed, 1800 insertions(+) create mode 100644 .env.example create mode 100644 .github/workflows/test.yml create mode 100644 .gitignore create mode 100644 Dockerfile create mode 100644 LICENSE create mode 100644 README.md create mode 100644 assets/composer/development.services.yml create mode 100644 assets/composer/settings.php create mode 100644 build.yaml create mode 100644 composer.json create mode 100644 config/sync/.htaccess create mode 100644 docker-compose.yaml create mode 100644 justfile create mode 100644 phpcs.xml.dist create mode 100644 phpstan.neon create mode 100644 phpstan.neon.dist create mode 100644 phpunit.xml.dist create mode 100755 tools/docker/images/php/root/usr/local/bin/docker-entrypoint-php create mode 100644 tools/docker/images/web/root/etc/nginx/conf.d/default.conf diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..f7bd786 --- /dev/null +++ b/.env.example @@ -0,0 +1,10 @@ +export DOCKER_UID=1000 + +export COMPOSE_PROJECT_NAME=docker-example-drupal-localgov +export COMPOSE_PROFILES=web,php,database + +export DOCKER_WEB_VOLUME=.:/app + +export MYSQL_DATABASE=app +export MYSQL_PASSWORD=app +export MYSQL_USER=app diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..8e2b08b --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,175 @@ +## +# Managed by https://github.com/localgovdrupal/github_workflow_manager +--- +name: Test localgovdrupal/localgov-project project + +on: + push: + branches: + - '2.x' + pull_request: + branches: + - '2.x' + schedule: + - cron: "0 7 * * *" + +env: + LOCALGOV_DRUPAL_PROJECT: localgovdrupal/localgov-project + LOCALGOV_DRUPAL_PROJECT_PATH: + +jobs: + + build: + name: Install LocalGov Drupal + runs-on: ubuntu-latest + + strategy: + fail-fast: false + matrix: + localgov-version: ["2.x"] + drupal-version: ["~9.1"] + php-version: ["7.4","8.1"] + + steps: + + - name: Save git branch and git repo names to env if this is not a pull request + if: github.event_name != 'pull_request' + run: | + echo "GIT_BASE=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV + echo "GIT_BRANCH=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV + echo "GIT_REPO=${GITHUB_REPOSITORY}" >> $GITHUB_ENV + + - name: Save git branch and git repo names to env if this is a pull request + if: github.event_name == 'pull_request' + run: | + echo "GIT_BASE=${GITHUB_BASE_REF}" >> $GITHUB_ENV + echo "GIT_BRANCH=${GITHUB_HEAD_REF}" >> $GITHUB_ENV + echo "GIT_REPO=${{ github.event.pull_request.head.repo.full_name }}" >> $GITHUB_ENV + + - name: Set composer branch reference for version branches + if: endsWith(github.ref, '.x') + run: echo "COMPOSER_REF=${GIT_BRANCH}-dev" >> $GITHUB_ENV + + - name: Set composer branch reference for non-version branches + if: endsWith(github.ref, '.x') == false + run: echo "COMPOSER_REF=dev-${GIT_BRANCH}" >> $GITHUB_ENV + + - name: Cached workspace + uses: actions/cache@v2 + with: + path: ./html + key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }} + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php-version }} + + - name: Clone drupal_container + uses: actions/checkout@v2 + with: + repository: localgovdrupal/drupal-container + ref: php${{ matrix.php-version }} + + - name: Create LocalGov Drupal project + run: composer create-project --stability dev localgovdrupal/localgov-project:${COMPOSER_REF} ./html + + phpcs: + name: Coding standards checks + needs: build + runs-on: ubuntu-latest + + strategy: + fail-fast: false + matrix: + localgov-version: ["2.x"] + drupal-version: ["~9.1"] + php-version: ["7.4","8.1"] + + steps: + + - name: Cached workspace + uses: actions/cache@v2 + with: + path: ./html + key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }} + restore-keys: | + localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}- + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php-version }} + + - name: Run coding standards checks + run: | + cd html + ./bin/phpcs -p ${LOCALGOV_DRUPAL_PROJECT_PATH} + + phpstan: + name: Deprecated code checks + needs: build + runs-on: ubuntu-latest + + strategy: + fail-fast: false + matrix: + localgov-version: ["2.x"] + drupal-version: ["~9.1"] + php-version: ["7.4","8.1"] + + steps: + + - name: Cached workspace + uses: actions/cache@v2 + with: + path: ./html + key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }} + restore-keys: | + localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}- + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php-version }} + + - name: Run deprecated code checks + run: | + cd html + ./bin/phpstan analyse -c ./phpstan.neon ./web/modules/contrib/localgov* ./web/profiles/contrib/localgov* ./web/themes/contrib/localgov* + phpunit: + name: PHPUnit tests + needs: build + runs-on: ubuntu-latest + + strategy: + fail-fast: false + matrix: + localgov-version: ["2.x"] + drupal-version: ["~9.1"] + php-version: ["7.4","8.1"] + + steps: + + - name: Clone Drupal container + uses: actions/checkout@v2 + with: + repository: localgovdrupal/drupal-container + ref: php${{ matrix.php-version }} + + - name: Cached workspace + uses: actions/cache@v2 + with: + path: ./html + key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }} + restore-keys: | + localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}- + + - name: Start Docker environment + run: docker-compose -f docker-compose.yml up -d + + - name: Run PHPUnit tests + run: | + mkdir -p ./html/web/sites/simpletest && chmod 777 ./html/web/sites/simpletest + docker exec -t drupal bash -c 'chown docker:docker -R /var/www/html' + docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/paratest --processes=4" diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e8b9513 --- /dev/null +++ b/.gitignore @@ -0,0 +1,79 @@ +# Ignore directories generated by Composer +/bin +/drush/contrib/ +/vendor/ +/web/core/ +/web/modules/contrib/ +/web/themes/contrib/ +/web/profiles/contrib/ +/web/libraries/ + +# Ignore composer.lock as this is template project +/composer.lock + +# Ignore sensitive information +/web/sites/*/settings*.php +/web/sites/*/services*.yml + +# Ignore Drupal's file directory +/web/sites/*/files/ + +# Ignore scaffold files +/.editorconfig +/.gitattributes +/web/.csslintrc +/web/.eslintignore +/web/.eslintrc.json +/web/.gitignore +/web/.ht.router.php +/web/.htaccess +/web/INSTALL.txt +/web/README.md +/web/README.txt +/web/autoload.php +/web/example.gitignore +/web/index.php +/web/modules/README.txt +/web/profiles/README.txt +/web/robots.txt +/web/sites/README.txt +/web/sites/default/default.services.yml +/web/sites/default/default.settings.php +/web/sites/development.services.yml +/web/sites/example.settings.local.php +/web/sites/example.sites.php +/web/themes/README.txt +/web/update.php +/web/web.config + +# Ignore SimpleTest multi-site environment +/web/sites/simpletest + +# Ignore IDE files +.idea/ +.vscode/ + +# Ignore .env files as they are personal +/.env + +# Ignore DB dumps +*.sql +*.sql.gz +*.mysql +*.mysql.gz + +# Ignore Lando overrides +.lando.local.yml + +# Ignore Lando Solr config +/.lando/solr + +# Ignore temp files +/.phpunit.result.cache + +# Ignore ddev configuration folders +.ddev/.global_commands/ +.ddev/commands/ +.ddev/homeadditions/ +.ddev/providers/ +.ddev/xhprof/ diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..40dab43 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,65 @@ +FROM php:8.1-fpm-bullseye AS base + +COPY --from=composer:2 /usr/bin/composer /usr/bin/composer +RUN which composer && composer -V + +ARG DOCKER_UID=1000 +ENV DOCKER_UID="${DOCKER_UID}" + +WORKDIR /app + +RUN adduser --disabled-password --uid "${DOCKER_UID}" app \ + && chown app:app -R /app + +USER app + +ENV PATH="${PATH}:/app/vendor/bin" + +COPY --chown=app:app composer.* ./ + +################################################################################ + +FROM base AS build + +USER root + +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 + +COPY --chown=app:app assets assets + +USER app + +RUN composer validate --strict +RUN composer install + +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 + + + +################################################################################ + +FROM nginx:1 as web + +EXPOSE 8080 + +WORKDIR /app + +COPY tools/docker/images/web/root / diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..23cb790 --- /dev/null +++ b/LICENSE @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {description} + Copyright (C) {year} {fullname} + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + {signature of Ty Coon}, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/README.md b/README.md new file mode 100644 index 0000000..a16f015 --- /dev/null +++ b/README.md @@ -0,0 +1,22 @@ +# LocalGov Drupal Composer project template + +![Tests](https://github.com/localgovdrupal/localgov_project/actions/workflows/test.yml/badge.svg) + +A Composer-based installer for the LocalGov Drupal distribution. + +This project template should provide a kickstart for managing your site dependencies with Composer. + +## Usage + +For guidance on installing see: + + - [Installing LocalGov Drupal locally with composer](https://github.com/localgovdrupal/localgov/blob/2.x/README.md#installing-localgov-drupal-locally-with-composer) + - [Getting started on LocalGov Drupal docs](https://docs.localgovdrupal.org/devs/getting-started/) + +## Maintainers + +This project is currently maintained by: + + - Ekes: https://www.drupal.org/u/ekes + - Finn Lewis: https://www.drupal.org/u/finn-lewis + - Stephen Cox: https://www.drupal.org/u/stephen-cox diff --git a/assets/composer/development.services.yml b/assets/composer/development.services.yml new file mode 100644 index 0000000..f887b08 --- /dev/null +++ b/assets/composer/development.services.yml @@ -0,0 +1,13 @@ +# Local development services. +# +# To activate this feature, follow the instructions at the top of the +# 'example.settings.local.php' file, which sits next to this file. +parameters: + http.response.debug_cacheability_headers: true + twig.config: + debug: true + auto_reload: false + cache: false +services: + cache.backend.null: + class: Drupal\Core\Cache\NullBackendFactory diff --git a/assets/composer/settings.php b/assets/composer/settings.php new file mode 100644 index 0000000..325e84f --- /dev/null +++ b/assets/composer/settings.php @@ -0,0 +1,765 @@ + 'databasename', + * 'username' => 'sqlusername', + * 'password' => 'sqlpassword', + * 'host' => 'localhost', + * 'port' => '3306', + * 'driver' => 'mysql', + * 'prefix' => '', + * 'collation' => 'utf8mb4_general_ci', + * ]; + * @endcode + */ +$databases = []; + +/** + * Customizing database settings. + * + * Many of the values of the $databases array can be customized for your + * particular database system. Refer to the sample in the section above as a + * starting point. + * + * The "driver" property indicates what Drupal database driver the + * connection should use. This is usually the same as the name of the + * database type, such as mysql or sqlite, but not always. The other + * properties will vary depending on the driver. For SQLite, you must + * specify a database file name in a directory that is writable by the + * webserver. For most other drivers, you must specify a + * username, password, host, and database name. + * + * Transaction support is enabled by default for all drivers that support it, + * including MySQL. To explicitly disable it, set the 'transactions' key to + * FALSE. + * Note that some configurations of MySQL, such as the MyISAM engine, don't + * support it and will proceed silently even if enabled. If you experience + * transaction related crashes with such configuration, set the 'transactions' + * key to FALSE. + * + * For each database, you may optionally specify multiple "target" databases. + * A target database allows Drupal to try to send certain queries to a + * different database if it can but fall back to the default connection if not. + * That is useful for primary/replica replication, as Drupal may try to connect + * to a replica server when appropriate and if one is not available will simply + * fall back to the single primary server (The terms primary/replica are + * traditionally referred to as master/slave in database server documentation). + * + * The general format for the $databases array is as follows: + * @code + * $databases['default']['default'] = $info_array; + * $databases['default']['replica'][] = $info_array; + * $databases['default']['replica'][] = $info_array; + * $databases['extra']['default'] = $info_array; + * @endcode + * + * In the above example, $info_array is an array of settings described above. + * The first line sets a "default" database that has one primary database + * (the second level default). The second and third lines create an array + * of potential replica databases. Drupal will select one at random for a given + * request as needed. The fourth line creates a new database with a name of + * "extra". + * + * You can optionally set prefixes for some or all database table names + * by using the 'prefix' setting. If a prefix is specified, the table + * name will be prepended with its value. Be sure to use valid database + * characters only, usually alphanumeric and underscore. If no prefixes + * are desired, leave it as an empty string ''. + * + * To have all database names prefixed, set 'prefix' as a string: + * @code + * 'prefix' => 'main_', + * @endcode + * + * Per-table prefixes are deprecated as of Drupal 8.2, and will be removed in + * Drupal 9.0. After that, only a single prefix for all tables will be + * supported. + * + * To provide prefixes for specific tables, set 'prefix' as an array. + * The array's keys are the table names and the values are the prefixes. + * The 'default' element is mandatory and holds the prefix for any tables + * not specified elsewhere in the array. Example: + * @code + * 'prefix' => [ + * 'default' => 'main_', + * 'users' => 'shared_', + * 'sessions' => 'shared_', + * 'role' => 'shared_', + * 'authmap' => 'shared_', + * ], + * @endcode + * You can also use a reference to a schema/database as a prefix. This may be + * useful if your Drupal installation exists in a schema that is not the default + * or you want to access several databases from the same code base at the same + * time. + * Example: + * @code + * 'prefix' => [ + * 'default' => 'main.', + * 'users' => 'shared.', + * 'sessions' => 'shared.', + * 'role' => 'shared.', + * 'authmap' => 'shared.', + * ]; + * @endcode + * NOTE: MySQL and SQLite's definition of a schema is a database. + * + * Advanced users can add or override initial commands to execute when + * connecting to the database server, as well as PDO connection settings. For + * example, to enable MySQL SELECT queries to exceed the max_join_size system + * variable, and to reduce the database connection timeout to 5 seconds: + * @code + * $databases['default']['default'] = [ + * 'init_commands' => [ + * 'big_selects' => 'SET SQL_BIG_SELECTS=1', + * ], + * 'pdo' => [ + * PDO::ATTR_TIMEOUT => 5, + * ], + * ]; + * @endcode + * + * WARNING: The above defaults are designed for database portability. Changing + * them may cause unexpected behavior, including potential data loss. See + * https://www.drupal.org/developing/api/database/configuration for more + * information on these defaults and the potential issues. + * + * More details can be found in the constructor methods for each driver: + * - \Drupal\Core\Database\Driver\mysql\Connection::__construct() + * - \Drupal\Core\Database\Driver\pgsql\Connection::__construct() + * - \Drupal\Core\Database\Driver\sqlite\Connection::__construct() + * + * Sample Database configuration format for PostgreSQL (pgsql): + * @code + * $databases['default']['default'] = [ + * 'driver' => 'pgsql', + * 'database' => 'databasename', + * 'username' => 'sqlusername', + * 'password' => 'sqlpassword', + * 'host' => 'localhost', + * 'prefix' => '', + * ]; + * @endcode + * + * Sample Database configuration format for SQLite (sqlite): + * @code + * $databases['default']['default'] = [ + * 'driver' => 'sqlite', + * 'database' => '/path/to/databasefilename', + * ]; + * @endcode + */ + +/** + * Location of the site configuration files. + * + * The $settings['config_sync_directory'] specifies the location of file system + * directory used for syncing configuration data. On install, the directory is + * created. This is used for configuration imports. + * + * The default location for this directory is inside a randomly-named + * directory in the public files path. The setting below allows you to set + * its location. + */ +$settings['config_sync_directory'] = '../config/sync'; + +/** + * Settings: + * + * $settings contains environment-specific configuration, such as the files + * directory and reverse proxy address, and temporary configuration, such as + * security overrides. + * + * @see \Drupal\Core\Site\Settings::get() + */ + +/** + * Salt for one-time login links, cancel links, form tokens, etc. + * + * This variable will be set to a random value by the installer. All one-time + * login links will be invalidated if the value is changed. Note that if your + * site is deployed on a cluster of web servers, you must ensure that this + * variable has the same value on each server. + * + * For enhanced security, you may set this variable to the contents of a file + * outside your document root; you should also ensure that this file is not + * stored with backups of your database. + * + * Example: + * @code + * $settings['hash_salt'] = file_get_contents('/home/example/salt.txt'); + * @endcode + */ +$settings['hash_salt'] = 'SOelBL-o8b_k0BIJBRC7piYZxDFPFjnsRANJW7t9xJJEXidbTDKDBYzUxXsejPEEgJg_wSfXIQ'; + +/** + * Deployment identifier. + * + * Drupal's dependency injection container will be automatically invalidated and + * rebuilt when the Drupal core version changes. When updating contributed or + * custom code that changes the container, changing this identifier will also + * allow the container to be invalidated as soon as code is deployed. + */ +# $settings['deployment_identifier'] = \Drupal::VERSION; + +/** + * Access control for update.php script. + * + * If you are updating your Drupal installation using the update.php script but + * are not logged in using either an account with the "Administer software + * updates" permission or the site maintenance account (the account that was + * created during installation), you will need to modify the access check + * statement below. Change the FALSE to a TRUE to disable the access check. + * After finishing the upgrade, be sure to open this file again and change the + * TRUE back to a FALSE! + */ +$settings['update_free_access'] = FALSE; + +/** + * External access proxy settings: + * + * If your site must access the Internet via a web proxy then you can enter the + * proxy settings here. Set the full URL of the proxy, including the port, in + * variables: + * - $settings['http_client_config']['proxy']['http']: The proxy URL for HTTP + * requests. + * - $settings['http_client_config']['proxy']['https']: The proxy URL for HTTPS + * requests. + * You can pass in the user name and password for basic authentication in the + * URLs in these settings. + * + * You can also define an array of host names that can be accessed directly, + * bypassing the proxy, in $settings['http_client_config']['proxy']['no']. + */ +# $settings['http_client_config']['proxy']['http'] = 'http://proxy_user:proxy_pass@example.com:8080'; +# $settings['http_client_config']['proxy']['https'] = 'http://proxy_user:proxy_pass@example.com:8080'; +# $settings['http_client_config']['proxy']['no'] = ['127.0.0.1', 'localhost']; + +/** + * Reverse Proxy Configuration: + * + * Reverse proxy servers are often used to enhance the performance + * of heavily visited sites and may also provide other site caching, + * security, or encryption benefits. In an environment where Drupal + * is behind a reverse proxy, the real IP address of the client should + * be determined such that the correct client IP address is available + * to Drupal's logging, statistics, and access management systems. In + * the most simple scenario, the proxy server will add an + * X-Forwarded-For header to the request that contains the client IP + * address. However, HTTP headers are vulnerable to spoofing, where a + * malicious client could bypass restrictions by setting the + * X-Forwarded-For header directly. Therefore, Drupal's proxy + * configuration requires the IP addresses of all remote proxies to be + * specified in $settings['reverse_proxy_addresses'] to work correctly. + * + * Enable this setting to get Drupal to determine the client IP from the + * X-Forwarded-For header. If you are unsure about this setting, do not have a + * reverse proxy, or Drupal operates in a shared hosting environment, this + * setting should remain commented out. + * + * In order for this setting to be used you must specify every possible + * reverse proxy IP address in $settings['reverse_proxy_addresses']. + * If a complete list of reverse proxies is not available in your + * environment (for example, if you use a CDN) you may set the + * $_SERVER['REMOTE_ADDR'] variable directly in settings.php. + * Be aware, however, that it is likely that this would allow IP + * address spoofing unless more advanced precautions are taken. + */ +# $settings['reverse_proxy'] = TRUE; + +/** + * Specify every reverse proxy IP address in your environment. + * This setting is required if $settings['reverse_proxy'] is TRUE. + */ +# $settings['reverse_proxy_addresses'] = ['a.b.c.d', ...]; + +/** + * Reverse proxy trusted headers. + * + * Sets which headers to trust from your reverse proxy. + * + * Common values are: + * - \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_ALL + * - \Symfony\Component\HttpFoundation\Request::HEADER_FORWARDED + * + * Note the default value of + * @code + * \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_ALL | \Symfony\Component\HttpFoundation\Request::HEADER_FORWARDED + * @endcode + * is not secure by default. The value should be set to only the specific + * headers the reverse proxy uses. For example: + * @code + * \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_ALL + * @endcode + * This would trust the following headers: + * - X_FORWARDED_FOR + * - X_FORWARDED_HOST + * - X_FORWARDED_PROTO + * - X_FORWARDED_PORT + * + * @see \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_ALL + * @see \Symfony\Component\HttpFoundation\Request::HEADER_FORWARDED + * @see \Symfony\Component\HttpFoundation\Request::setTrustedProxies + */ +# $settings['reverse_proxy_trusted_headers'] = \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_ALL | \Symfony\Component\HttpFoundation\Request::HEADER_FORWARDED; + + +/** + * Page caching: + * + * By default, Drupal sends a "Vary: Cookie" HTTP header for anonymous page + * views. This tells a HTTP proxy that it may return a page from its local + * cache without contacting the web server, if the user sends the same Cookie + * header as the user who originally requested the cached page. Without "Vary: + * Cookie", authenticated users would also be served the anonymous page from + * the cache. If the site has mostly anonymous users except a few known + * editors/administrators, the Vary header can be omitted. This allows for + * better caching in HTTP proxies (including reverse proxies), i.e. even if + * clients send different cookies, they still get content served from the cache. + * However, authenticated users should access the site directly (i.e. not use an + * HTTP proxy, and bypass the reverse proxy if one is used) in order to avoid + * getting cached pages from the proxy. + */ +# $settings['omit_vary_cookie'] = TRUE; + + +/** + * Cache TTL for client error (4xx) responses. + * + * Items cached per-URL tend to result in a large number of cache items, and + * this can be problematic on 404 pages which by their nature are unbounded. A + * fixed TTL can be set for these items, defaulting to one hour, so that cache + * backends which do not support LRU can purge older entries. To disable caching + * of client error responses set the value to 0. Currently applies only to + * page_cache module. + */ +# $settings['cache_ttl_4xx'] = 3600; + +/** + * Expiration of cached forms. + * + * Drupal's Form API stores details of forms in a cache and these entries are + * kept for at least 6 hours by default. Expired entries are cleared by cron. + * + * @see \Drupal\Core\Form\FormCache::setCache() + */ +# $settings['form_cache_expiration'] = 21600; + +/** + * Class Loader. + * + * If the APC extension is detected, the Symfony APC class loader is used for + * performance reasons. Detection can be prevented by setting + * class_loader_auto_detect to false, as in the example below. + */ +# $settings['class_loader_auto_detect'] = FALSE; + +/* + * If the APC extension is not detected, either because APC is missing or + * because auto-detection has been disabled, auto-loading falls back to + * Composer's ClassLoader, which is good for development as it does not break + * when code is moved in the file system. You can also decorate the base class + * loader with another cached solution than the Symfony APC class loader, as + * all production sites should have a cached class loader of some sort enabled. + * + * To do so, you may decorate and replace the local $class_loader variable. For + * example, to use Symfony's APC class loader without automatic detection, + * uncomment the code below. + */ +/* +if ($settings['hash_salt']) { + $prefix = 'drupal.' . hash('sha256', 'drupal.' . $settings['hash_salt']); + $apc_loader = new \Symfony\Component\ClassLoader\ApcClassLoader($prefix, $class_loader); + unset($prefix); + $class_loader->unregister(); + $apc_loader->register(); + $class_loader = $apc_loader; +} +*/ + +/** + * Authorized file system operations: + * + * The Update Manager module included with Drupal provides a mechanism for + * site administrators to securely install missing updates for the site + * directly through the web user interface. On securely-configured servers, + * the Update manager will require the administrator to provide SSH or FTP + * credentials before allowing the installation to proceed; this allows the + * site to update the new files as the user who owns all the Drupal files, + * instead of as the user the webserver is running as. On servers where the + * webserver user is itself the owner of the Drupal files, the administrator + * will not be prompted for SSH or FTP credentials (note that these server + * setups are common on shared hosting, but are inherently insecure). + * + * Some sites might wish to disable the above functionality, and only update + * the code directly via SSH or FTP themselves. This setting completely + * disables all functionality related to these authorized file operations. + * + * @see https://www.drupal.org/node/244924 + * + * Remove the leading hash signs to disable. + */ +# $settings['allow_authorize_operations'] = FALSE; + +/** + * Default mode for directories and files written by Drupal. + * + * Value should be in PHP Octal Notation, with leading zero. + */ +# $settings['file_chmod_directory'] = 0775; +# $settings['file_chmod_file'] = 0664; + +/** + * Public file base URL: + * + * An alternative base URL to be used for serving public files. This must + * include any leading directory path. + * + * A different value from the domain used by Drupal to be used for accessing + * public files. This can be used for a simple CDN integration, or to improve + * security by serving user-uploaded files from a different domain or subdomain + * pointing to the same server. Do not include a trailing slash. + */ +# $settings['file_public_base_url'] = 'http://downloads.example.com/files'; + +/** + * Public file path: + * + * A local file system path where public files will be stored. This directory + * must exist and be writable by Drupal. This directory must be relative to + * the Drupal installation directory and be accessible over the web. + */ +# $settings['file_public_path'] = 'sites/default/files'; + +/** + * Private file path: + * + * A local file system path where private files will be stored. This directory + * must be absolute, outside of the Drupal installation directory and not + * accessible over the web. + * + * Note: Caches need to be cleared when this value is changed to make the + * private:// stream wrapper available to the system. + * + * See https://www.drupal.org/documentation/modules/file for more information + * about securing private files. + */ +# $settings['file_private_path'] = ''; + +/** + * Temporary file path: + * + * A local file system path where temporary files will be stored. This directory + * must be absolute, outside of the Drupal installation directory and not + * accessible over the web. + * + * If this is not set, the default for the operating system will be used. + * + * @see \Drupal\Component\FileSystem\FileSystem::getOsTemporaryDirectory() + */ +# $settings['file_temp_path'] = '/tmp'; + +/** + * Session write interval: + * + * Set the minimum interval between each session write to database. + * For performance reasons it defaults to 180. + */ +# $settings['session_write_interval'] = 180; + +/** + * String overrides: + * + * To override specific strings on your site with or without enabling the Locale + * module, add an entry to this list. This functionality allows you to change + * a small number of your site's default English language interface strings. + * + * Remove the leading hash signs to enable. + * + * The "en" part of the variable name, is dynamic and can be any langcode of + * any added language. (eg locale_custom_strings_de for german). + */ +# $settings['locale_custom_strings_en'][''] = [ +# 'forum' => 'Discussion board', +# '@count min' => '@count minutes', +# ]; + +/** + * A custom theme for the offline page: + * + * This applies when the site is explicitly set to maintenance mode through the + * administration page or when the database is inactive due to an error. + * The template file should also be copied into the theme. It is located inside + * 'core/modules/system/templates/maintenance-page.html.twig'. + * + * Note: This setting does not apply to installation and update pages. + */ +# $settings['maintenance_theme'] = 'bartik'; + +/** + * PHP settings: + * + * To see what PHP settings are possible, including whether they can be set at + * runtime (by using ini_set()), read the PHP documentation: + * http://php.net/manual/ini.list.php + * See \Drupal\Core\DrupalKernel::bootEnvironment() for required runtime + * settings and the .htaccess file for non-runtime settings. + * Settings defined there should not be duplicated here so as to avoid conflict + * issues. + */ + +/** + * If you encounter a situation where users post a large amount of text, and + * the result is stripped out upon viewing but can still be edited, Drupal's + * output filter may not have sufficient memory to process it. If you + * experience this issue, you may wish to uncomment the following two lines + * and increase the limits of these variables. For more information, see + * http://php.net/manual/pcre.configuration.php. + */ +# ini_set('pcre.backtrack_limit', 200000); +# ini_set('pcre.recursion_limit', 200000); + +/** + * Configuration overrides. + * + * To globally override specific configuration values for this site, + * set them here. You usually don't need to use this feature. This is + * useful in a configuration file for a vhost or directory, rather than + * the default settings.php. + * + * Note that any values you provide in these variable overrides will not be + * viewable from the Drupal administration interface. The administration + * interface displays the values stored in configuration so that you can stage + * changes to other environments that don't have the overrides. + * + * There are particular configuration values that are risky to override. For + * example, overriding the list of installed modules in 'core.extension' is not + * supported as module install or uninstall has not occurred. Other examples + * include field storage configuration, because it has effects on database + * structure, and 'core.menu.static_menu_link_overrides' since this is cached in + * a way that is not config override aware. Also, note that changing + * configuration values in settings.php will not fire any of the configuration + * change events. + */ +# $config['system.site']['name'] = 'My Drupal site'; +# $config['user.settings']['anonymous'] = 'Visitor'; + +/** + * Fast 404 pages: + * + * Drupal can generate fully themed 404 pages. However, some of these responses + * are for images or other resource files that are not displayed to the user. + * This can waste bandwidth, and also generate server load. + * + * The options below return a simple, fast 404 page for URLs matching a + * specific pattern: + * - $config['system.performance']['fast_404']['exclude_paths']: A regular + * expression to match paths to exclude, such as images generated by image + * styles, or dynamically-resized images. The default pattern provided below + * also excludes the private file system. If you need to add more paths, you + * can add '|path' to the expression. + * - $config['system.performance']['fast_404']['paths']: A regular expression to + * match paths that should return a simple 404 page, rather than the fully + * themed 404 page. If you don't have any aliases ending in htm or html you + * can add '|s?html?' to the expression. + * - $config['system.performance']['fast_404']['html']: The html to return for + * simple 404 pages. + * + * Remove the leading hash signs if you would like to alter this functionality. + */ +# $config['system.performance']['fast_404']['exclude_paths'] = '/\/(?:styles)|(?:system\/files)\//'; +# $config['system.performance']['fast_404']['paths'] = '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i'; +# $config['system.performance']['fast_404']['html'] = '404 Not Found

Not Found

The requested URL "@path" was not found on this server.

'; + +/** + * Load services definition file. + */ +$settings['container_yamls'][] = $app_root . '/' . $site_path . '/services.yml'; + +/** + * Override the default service container class. + * + * This is useful for example to trace the service container for performance + * tracking purposes, for testing a service container with an error condition or + * to test a service container that throws an exception. + */ +# $settings['container_base_class'] = '\Drupal\Core\DependencyInjection\Container'; + +/** + * Override the default yaml parser class. + * + * Provide a fully qualified class name here if you would like to provide an + * alternate implementation YAML parser. The class must implement the + * \Drupal\Component\Serialization\SerializationInterface interface. + */ +# $settings['yaml_parser_class'] = NULL; + +/** + * Trusted host configuration. + * + * Drupal core can use the Symfony trusted host mechanism to prevent HTTP Host + * header spoofing. + * + * To enable the trusted host mechanism, you enable your allowable hosts + * in $settings['trusted_host_patterns']. This should be an array of regular + * expression patterns, without delimiters, representing the hosts you would + * like to allow. + * + * For example: + * @code + * $settings['trusted_host_patterns'] = [ + * '^www\.example\.com$', + * ]; + * @endcode + * will allow the site to only run from www.example.com. + * + * If you are running multisite, or if you are running your site from + * different domain names (eg, you don't redirect http://www.example.com to + * http://example.com), you should specify all of the host patterns that are + * allowed by your site. + * + * For example: + * @code + * $settings['trusted_host_patterns'] = [ + * '^example\.com$', + * '^.+\.example\.com$', + * '^example\.org$', + * '^.+\.example\.org$', + * ]; + * @endcode + * will allow the site to run off of all variants of example.com and + * example.org, with all subdomains included. + */ + +/** + * The default list of directories that will be ignored by Drupal's file API. + * + * By default ignore node_modules and bower_components folders to avoid issues + * with common frontend tools and recursive scanning of directories looking for + * extensions. + * + * @see \Drupal\Core\File\FileSystemInterface::scanDirectory() + * @see \Drupal\Core\Extension\ExtensionDiscovery::scanDirectory() + */ +$settings['file_scan_ignore_directories'] = [ + 'node_modules', + 'bower_components', +]; + +/** + * The default number of entities to update in a batch process. + * + * This is used by update and post-update functions that need to go through and + * change all the entities on a site, so it is useful to increase this number + * if your hosting configuration (i.e. RAM allocation, CPU speed) allows for a + * larger number of entities to be processed in a single batch run. + */ +$settings['entity_update_batch_size'] = 50; + +/** + * Entity update backup. + * + * This is used to inform the entity storage handler that the backup tables as + * well as the original entity type and field storage definitions should be + * retained after a successful entity update process. + */ +$settings['entity_update_backup'] = TRUE; + +/** + * Load local development override configuration, if available. + * + * Use settings.local.php to override variables on secondary (staging, + * development, etc) installations of this site. Typically used to disable + * caching, JavaScript/CSS compression, re-routing of outgoing emails, and + * other things that should not happen on development and testing sites. + * + * Keep this code block at the end of this file to take full effect. + */ +if (file_exists($app_root . '/' . $site_path . '/settings.local.php')) { + include $app_root . '/' . $site_path . '/settings.local.php'; +} +elseif (getenv('LANDO_SERVICE_NAME') == 'appserver' && file_exists($app_root . '/' . $site_path . '/settings.lando.php')) { + include $app_root . '/' . $site_path . '/settings.lando.php'; +} + +// Automatically generated include for settings managed by ddev. +$ddev_settings = dirname(__FILE__) . '/settings.ddev.php'; +if (getenv('IS_DDEV_PROJECT') == 'true' && is_readable($ddev_settings)) { + require $ddev_settings; +} diff --git a/build.yaml b/build.yaml new file mode 100644 index 0000000..1aa5202 --- /dev/null +++ b/build.yaml @@ -0,0 +1,53 @@ +name: docker-example-drupal-localgov +language: php +type: drupal-project + +web: + type: nginx + +database: + type: mariadb + version: 10 + +php: + version: 8.1-fpm-bullseye + phpcs: + standard: Drupal,DrupalPractice + phpstan: + level: max + +docker-compose: + services: + database: ~ + php: + build: + target: build + +dockerfile: + stages: + build: + extends: base + packages: + - git + - libpng-dev + - libzip-dev + - mariadb-client + - unzip + extensions: + install: + - gd + - pdo_mysql + - zip + commands: + - composer validate --strict + - composer install + extra_directories: + - assets + + test: + extends: base + commands: + - parallel-lint src --no-progress + - phpcs -vv + - phpstan + - phpunit --testdox diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..1aeaab0 --- /dev/null +++ b/composer.json @@ -0,0 +1,81 @@ +{ + "name": "localgovdrupal/localgov-project", + "description": "Project template for the LocalGov Drupal distribution.", + "type": "project", + "license": "GPL-2.0-or-later", + "homepage": "https://github.com/localgovdrupal/localgov_project", + "repositories": { + "drupal": { + "type": "composer", + "url": "https://packages.drupal.org/8" + } + }, + "require": { + "composer/installers": "^1.10", + "cweagans/composer-patches": "^1.6", + "drupal/core-composer-scaffold": "^10.0", + "drupal/core-recommended": "^10.0", + "localgovdrupal/localgov": "3.x", + "localgovdrupal/localgov_search_solr": "dev-feature/drupal-10 as 1.1.0-alpha1" + }, + "require-dev": { + "brianium/paratest": "^6.0", + "drupal/coder": "^8.3", + "drupal/core-dev": "^10.0", + "mglaman/phpstan-drupal": "^1.0", + "phpspec/prophecy-phpunit": "^2", + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-deprecation-rules": "^1.0", + "squizlabs/php_codesniffer": "^3.6" + }, + "conflict": { + "drupal/drupal": "*" + }, + "minimum-stability": "dev", + "prefer-stable": true, + "config": { + "sort-packages": true, + "bin-dir": "bin/", + "allow-plugins": { + "composer/installers": true, + "cweagans/composer-patches": true, + "drupal/core-composer-scaffold": true, + "drupal/core-project-message": true, + "phpstan/extension-installer": true, + "dealerdirect/phpcodesniffer-composer-installer": true, + "php-http/discovery": true + } + }, + "extra": { + "enable-patching": true, + "drupal-scaffold": { + "locations": { + "web-root": "web/" + }, + "file-mapping": { + "[web-root]/sites/default/settings.php": { + "mode": "replace", + "path": "assets/composer/settings.php", + "overwrite": false + }, + "[web-root]/sites/default/settings.lando.php": { + "mode": "replace", + "path": "assets/composer/settings.lando.php", + "overwrite": false + }, + "[web-root]/sites/development.services.yml": "assets/composer/development.services.yml" + } + }, + "installer-paths": { + "web/core": ["type:drupal-core"], + "web/libraries/{$name}": ["type:drupal-library"], + "web/modules/contrib/{$name}": ["type:drupal-module"], + "web/profiles/contrib/{$name}": ["type:drupal-profile"], + "web/themes/contrib/{$name}": ["type:drupal-theme"], + "drush/Commands/contrib/{$name}": ["type:drupal-drush"], + "web/modules/custom/{$name}": ["type:drupal-custom-module"], + "web/themes/custom/{$name}": ["type:drupal-custom-theme"] + } + + } +} diff --git a/config/sync/.htaccess b/config/sync/.htaccess new file mode 100644 index 0000000..c323d54 --- /dev/null +++ b/config/sync/.htaccess @@ -0,0 +1,27 @@ +# Deny all requests from Apache 2.4+. + + Require all denied + + +# Deny all requests from Apache 2.0-2.2. + + Deny from all + + +# Turn off all options we don't need. +Options -Indexes -ExecCGI -Includes -MultiViews + +# Set the catch-all handler to prevent scripts from being executed. +SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006 + + # Override the handler again if we're run later in the evaluation list. + SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003 + + +# If we know how to do it safely, disable the PHP engine entirely. + + php_flag engine off + + + php_flag engine off + \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000..9097f99 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,66 @@ +x-app: &default-app + volumes: + - "${DOCKER_WEB_VOLUME:-./web:/app/web}" + env_file: + - .env + restart: "${DOCKER_RESTART_POLICY:-unless-stopped}" + networks: + - default + deploy: + resources: + limits: + cpus: "${DOCKER_MYSQL_CPUS:-0}" + memory: "${DOCKER_MYSQL_MEMORY:-0}" + labels: + - "traefik.enabled=false" + tty: true + +services: + web: + <<: *default-app + build: + context: . + target: web + depends_on: + - php + networks: + - default + - web + labels: + - "traefik.docker.network=traefik_proxy" + - "traefik.http.routers.${COMPOSE_PROJECT_NAME}.rule=Host( + `${COMPOSE_PROJECT_NAME}.localhost`, + )" + profiles: [web] + + php: + <<: *default-app + build: + context: . + target: build + 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 diff --git a/justfile b/justfile new file mode 100644 index 0000000..3571c9d --- /dev/null +++ b/justfile @@ -0,0 +1,19 @@ +default: + @just --list + +composer *args: + just _exec php composer {{ args }} + +phpunit *args: + just _run --rm php phpunit {{ args }} + +alias test := phpunit + +drush *args: + just _exec php drush {{ args }} + +_exec +args: + docker compose exec {{ args }} + +_run +args: + docker compose run {{ args }} diff --git a/phpcs.xml.dist b/phpcs.xml.dist new file mode 100644 index 0000000..2b1f599 --- /dev/null +++ b/phpcs.xml.dist @@ -0,0 +1,7 @@ + + + PHPCS configuration file for docker-example-drupal-localgov. + src + + + diff --git a/phpstan.neon b/phpstan.neon new file mode 100644 index 0000000..d4a500a --- /dev/null +++ b/phpstan.neon @@ -0,0 +1,12 @@ +parameters: + customRulesetUsed: true + reportUnmatchedIgnoredErrors: false + # Ignore phpstan-drupal extension's rules. + ignoreErrors: + - '#\Drupal calls should be avoided in classes, use dependency injection instead#' + - '#Plugin definitions cannot be altered.#' + - '#Missing cache backend declaration for performance.#' + - '#Plugin manager has cache backend specified but does not declare cache tags.#' +#includes: +# - vendor/mglaman/phpstan-drupal/extension.neon +# - vendor/phpstan/phpstan-deprecation-rules/rules.neon diff --git a/phpstan.neon.dist b/phpstan.neon.dist new file mode 100644 index 0000000..76bd437 --- /dev/null +++ b/phpstan.neon.dist @@ -0,0 +1,5 @@ +parameters: + level: max + paths: + - src + \ No newline at end of file diff --git a/phpunit.xml.dist b/phpunit.xml.dist new file mode 100644 index 0000000..2308917 --- /dev/null +++ b/phpunit.xml.dist @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + ./web/modules/custom/**/tests/**/Functional + + + ./web/modules/custom/**/tests/**/Kernel + + + ./web/modules/custom/**/tests/**/Unit + + + diff --git a/tools/docker/images/php/root/usr/local/bin/docker-entrypoint-php b/tools/docker/images/php/root/usr/local/bin/docker-entrypoint-php new file mode 100755 index 0000000..564778b --- /dev/null +++ b/tools/docker/images/php/root/usr/local/bin/docker-entrypoint-php @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +[[ -f composer.json && ! -d vendor ]] && composer install + +eval "$@" diff --git a/tools/docker/images/web/root/etc/nginx/conf.d/default.conf b/tools/docker/images/web/root/etc/nginx/conf.d/default.conf new file mode 100644 index 0000000..b032e23 --- /dev/null +++ b/tools/docker/images/web/root/etc/nginx/conf.d/default.conf @@ -0,0 +1,20 @@ +server { + server_name _; + + root /app/web; + + location / { + try_files $uri /index.php?$query_string; + } + + location ~ \.php(/|$) { + fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + try_files $fastcgi_script_name =404; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param QUERY_STRING $query_string; + fastcgi_intercept_errors on; + fastcgi_pass php:9000; + } +} From 254359239a02c1a933c1ff4ba19faa088725f8df Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 3 Mar 2023 23:04:06 +0000 Subject: [PATCH 02/65] fix: add `/app/bin` to PATH to fix Drush Fixes #11 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 40dab43..395f3d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ RUN adduser --disabled-password --uid "${DOCKER_UID}" app \ USER app -ENV PATH="${PATH}:/app/vendor/bin" +ENV PATH="${PATH}:/app/bin:/app/vendor/bin" COPY --chown=app:app composer.* ./ From 6d6bf27d6fd760e9cc6cacf42b60158d82d54486 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 3 Mar 2023 23:50:38 +0000 Subject: [PATCH 03/65] docs: add installation instructions --- README.md | 27 ++++++++------------------- README.original.md | 22 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 README.original.md diff --git a/README.md b/README.md index a16f015..8d41de8 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,11 @@ -# LocalGov Drupal Composer project template +# docker-example-drupal-localgov -![Tests](https://github.com/localgovdrupal/localgov_project/actions/workflows/test.yml/badge.svg) +## Installation -A Composer-based installer for the LocalGov Drupal distribution. +```bash +# With just +just drush site:install -y --db-url=mysql://app:app@database/app localgov -This project template should provide a kickstart for managing your site dependencies with Composer. - -## Usage - -For guidance on installing see: - - - [Installing LocalGov Drupal locally with composer](https://github.com/localgovdrupal/localgov/blob/2.x/README.md#installing-localgov-drupal-locally-with-composer) - - [Getting started on LocalGov Drupal docs](https://docs.localgovdrupal.org/devs/getting-started/) - -## Maintainers - -This project is currently maintained by: - - - Ekes: https://www.drupal.org/u/ekes - - Finn Lewis: https://www.drupal.org/u/finn-lewis - - Stephen Cox: https://www.drupal.org/u/stephen-cox +# Without just +docker compose exec php drush site:install -y --db-url=mysql://app:app@database/app localgov +``` diff --git a/README.original.md b/README.original.md new file mode 100644 index 0000000..3382ba1 --- /dev/null +++ b/README.original.md @@ -0,0 +1,22 @@ +# LocalGov Drupal Composer project template + +![Tests](https://github.com/localgovdrupal/localgov_project/actions/workflows/test.yml/badge.svg) + +A Composer-based installer for the LocalGov Drupal distribution. + +This project template should provide a kickstart for managing your site dependencies with Composer. + +## Usage + +For guidance on installing see: + + - [Installing LocalGov Drupal locally with composer](https://github.com/localgovdrupal/localgov/blob/2.x/README.md#installing-localgov-drupal-locally-with-composer) + - [Getting started on LocalGov Drupal docs](https://docs.localgovdrupal.org/devs/getting-started/) + +## Maintainers + +This project is currently maintained by: + + - Ekes: https://www.drupal.org/u/ekes + - Finn Lewis: https://www.drupal.org/u/finn-lewis + - Stephen Cox: https://www.drupal.org/u/stephen-cox From e885ed948a19fd212482195dcd3272882b0c93b0 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 14 Mar 2023 20:20:52 +0000 Subject: [PATCH 04/65] build: update configuration files --- .dockerignore | 2 ++ .env.example | 8 +++++--- Dockerfile | 5 +++++ docker-compose.yaml | 6 +++++- justfile | 16 ++++++++-------- phpcs.xml.dist | 1 + phpstan.neon.dist | 2 ++ phpunit.xml.dist | 2 +- .../php/root/usr/local/bin/docker-entrypoint-php | 2 ++ .../web/root/etc/nginx/conf.d/default.conf | 2 ++ 10 files changed, 33 insertions(+), 13 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..6b276be --- /dev/null +++ b/.dockerignore @@ -0,0 +1,2 @@ +/.github +/README.md diff --git a/.env.example b/.env.example index f7bd786..f3b9e70 100644 --- a/.env.example +++ b/.env.example @@ -1,3 +1,5 @@ +# Do not edit this file. It is automatically generated by 'build-configs'. + export DOCKER_UID=1000 export COMPOSE_PROJECT_NAME=docker-example-drupal-localgov @@ -5,6 +7,6 @@ export COMPOSE_PROFILES=web,php,database export DOCKER_WEB_VOLUME=.:/app -export MYSQL_DATABASE=app -export MYSQL_PASSWORD=app -export MYSQL_USER=app +export MYSQL_DATABASE=drupal +export MYSQL_PASSWORD=drupal +export MYSQL_USER=drupal diff --git a/Dockerfile b/Dockerfile index 395f3d2..3b7316e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,5 @@ +# Do not edit this file. It is automatically generated by 'build-configs'. + FROM php:8.1-fpm-bullseye AS base COPY --from=composer:2 /usr/bin/composer /usr/bin/composer @@ -29,8 +31,11 @@ RUN apt-get update -yqq \ RUN docker-php-ext-install gd pdo_mysql zip +COPY --chown=app:app phpunit.xml* ./ + COPY --chown=app:app assets assets + USER app RUN composer validate --strict diff --git a/docker-compose.yaml b/docker-compose.yaml index 9097f99..3fd36d2 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,3 +1,5 @@ +# Do not edit this file. It is automatically generated by 'build-configs'. + x-app: &default-app volumes: - "${DOCKER_WEB_VOLUME:-./web:/app/web}" @@ -32,12 +34,14 @@ services: `${COMPOSE_PROJECT_NAME}.localhost`, )" profiles: [web] - + php: <<: *default-app build: context: . target: build + volumes: + - .:/app depends_on: - database profiles: [php] diff --git a/justfile b/justfile index 3571c9d..b675064 100644 --- a/justfile +++ b/justfile @@ -1,19 +1,19 @@ +# Do not edit this file. It is automatically generated by 'build-configs'. + default: @just --list composer *args: just _exec php composer {{ args }} -phpunit *args: - just _run --rm php phpunit {{ args }} - -alias test := phpunit - drush *args: just _exec php drush {{ args }} +install *args: + just _exec php drush site:install -y {{ args }} + + + + _exec +args: docker compose exec {{ args }} - -_run +args: - docker compose run {{ args }} diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 2b1f599..138c0c1 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -1,3 +1,4 @@ + PHPCS configuration file for docker-example-drupal-localgov. diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 76bd437..b629b09 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -1,3 +1,5 @@ +# Do not edit this file. It is automatically generated by 'build-configs'. + parameters: level: max paths: diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 2308917..b996820 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,5 +1,5 @@ + - Date: Tue, 14 Mar 2023 22:53:30 +0000 Subject: [PATCH 05/65] fix: add settings.lando.php This is needed for `composer install` to run. --- assets/composer/settings.lando.php | 169 +++++++++++++++++++++++++++++ 1 file changed, 169 insertions(+) create mode 100644 assets/composer/settings.lando.php diff --git a/assets/composer/settings.lando.php b/assets/composer/settings.lando.php new file mode 100644 index 0000000..bfbf609 --- /dev/null +++ b/assets/composer/settings.lando.php @@ -0,0 +1,169 @@ + 'database', + 'username' => 'database', + 'password' => 'database', + 'host' => 'database', + 'port' => '3306', + 'driver' => 'mysql', + 'prefix' => '', + 'collation' => 'utf8mb4_general_ci', +); + +/** + * Error reporting. + * + * As a developer it is useful to see all errors. If the site you are working + * on has a lot of notice errors and you aren't able to fix them you can + * suppress them by modifying E_ALL in error_reporting to: + * E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED + */ +error_reporting(E_ALL); +ini_set('display_errors', TRUE); +ini_set('display_startup_errors', TRUE); + +/** + * Stage file proxy. + * + * To use stage file proxy you will need the module enabled. Then uncomment + * the config line below and edit the domain to suit. If the domain is behind + * http auth then you can use agile:collective before the @ sign (or whatever + * user/pass combination you need). Change the domain.org part to match the + * domain (usually production, sometimes development) with the images. + */ +// $config['stage_file_proxy.settings']['origin'] = 'http://example.com'; + From fb82b68e33971e81013cb17710cd6f4f2e3ba542 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 14 Mar 2023 23:08:49 +0000 Subject: [PATCH 06/65] build: update configuration files --- docker-compose.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 3fd36d2..88a6ef3 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,8 +1,9 @@ # Do not edit this file. It is automatically generated by 'build-configs'. +drupal-project x-app: &default-app volumes: - - "${DOCKER_WEB_VOLUME:-./web:/app/web}" +- "${DOCKER_WEB_VOLUME:-./:/app}" env_file: - .env restart: "${DOCKER_RESTART_POLICY:-unless-stopped}" From caf5b7295e3ef376df417c624fcfc37ea7973a56 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 14 Mar 2023 23:12:15 +0000 Subject: [PATCH 07/65] build: update configuration files --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 88a6ef3..a5ccd2c 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,7 +3,7 @@ drupal-project x-app: &default-app volumes: -- "${DOCKER_WEB_VOLUME:-./:/app}" + - "${DOCKER_WEB_VOLUME:-./1:/app}" env_file: - .env restart: "${DOCKER_RESTART_POLICY:-unless-stopped}" From 41d299c4bfed650320d283fe2696091c7472a180 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 14 Mar 2023 23:12:55 +0000 Subject: [PATCH 08/65] build: update configuration files --- docker-compose.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index a5ccd2c..ec6ba0c 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,6 +1,5 @@ # Do not edit this file. It is automatically generated by 'build-configs'. -drupal-project x-app: &default-app volumes: - "${DOCKER_WEB_VOLUME:-./1:/app}" From 96b7d3276c516e9fe799804548430c56f37bad1c Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 14 Mar 2023 23:19:52 +0000 Subject: [PATCH 09/65] build: update configuration files --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index ec6ba0c..3fd36d2 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -2,7 +2,7 @@ x-app: &default-app volumes: - - "${DOCKER_WEB_VOLUME:-./1:/app}" + - "${DOCKER_WEB_VOLUME:-./web:/app/web}" env_file: - .env restart: "${DOCKER_RESTART_POLICY:-unless-stopped}" From 34f4a9a7220af45c034028f1ae59cd30b3321718 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 17 Mar 2023 15:45:58 +0000 Subject: [PATCH 10/65] build: update configuration files --- docker-compose.yaml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 3fd36d2..a59181e 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,5 +1,15 @@ # Do not edit this file. It is automatically generated by 'build-configs'. +x-proxy: &default-proxy + networks: + - default + - web + labels: + - "traefik.docker.network=traefik_proxy" + - "traefik.http.routers.${COMPOSE_PROJECT_NAME}.rule=Host( + `${COMPOSE_PROJECT_NAME}.localhost`, + )" + x-app: &default-app volumes: - "${DOCKER_WEB_VOLUME:-./web:/app/web}" @@ -20,19 +30,12 @@ x-app: &default-app services: web: <<: *default-app + <<: *default-proxy build: context: . target: web depends_on: - php - networks: - - default - - web - labels: - - "traefik.docker.network=traefik_proxy" - - "traefik.http.routers.${COMPOSE_PROJECT_NAME}.rule=Host( - `${COMPOSE_PROJECT_NAME}.localhost`, - )" profiles: [web] php: From ed68943c3ff582644efb7ad173dc42e4b3832f44 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 17 Mar 2023 16:56:42 +0000 Subject: [PATCH 11/65] build: update configuration files --- docker-compose.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index a59181e..222b847 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -43,6 +43,8 @@ services: build: context: . target: build + args: + - "DOCKER_UID=${DOCKER_UID:-1000}" volumes: - .:/app depends_on: From 082bc1b13ccb8661046955ebc66e24517ae3b7f3 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 30 Mar 2023 23:21:11 +0100 Subject: [PATCH 12/65] build: add drupal.docroot --- build.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.yaml b/build.yaml index 1aa5202..a92ade3 100644 --- a/build.yaml +++ b/build.yaml @@ -16,6 +16,9 @@ php: phpstan: level: max +drupal: + docroot: web + docker-compose: services: database: ~ From a8aa7e967ffa032d5745820b49f26c39fa928f90 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 7 Apr 2023 01:22:20 +0100 Subject: [PATCH 13/65] build: update configuration files --- .hadolint.yaml | 2 ++ docker-compose.yaml | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 .hadolint.yaml diff --git a/.hadolint.yaml b/.hadolint.yaml new file mode 100644 index 0000000..d87bf88 --- /dev/null +++ b/.hadolint.yaml @@ -0,0 +1,2 @@ +ignore: + - DL3059 diff --git a/docker-compose.yaml b/docker-compose.yaml index 222b847..266559a 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -29,8 +29,7 @@ x-app: &default-app services: web: - <<: *default-app - <<: *default-proxy + <<: [*default-proxy, *default-app] build: context: . target: web From b234483fea869ebb9d3498c2380f3a0374e0388a Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 7 Apr 2023 09:54:11 +0100 Subject: [PATCH 14/65] build: update configuration files --- docker-compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index 266559a..9260c27 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -59,6 +59,7 @@ services: memory: "${DOCKER_MYSQL_MEMORY:-0}" volumes: - db-data:/var/lib/mysql + env_file: - .env labels: From b556536e9216de4b95eac0c756e1d0f8e4c1a1c2 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 11 Apr 2023 00:36:48 +0100 Subject: [PATCH 15/65] build: update configuration files --- phpcs.xml.dist | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 138c0c1..418b137 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -1,5 +1,6 @@ - + + PHPCS configuration file for docker-example-drupal-localgov. src From a622e8964af156ec8669731419580d22a8cb942c Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 12 Apr 2023 22:22:59 +0100 Subject: [PATCH 16/65] build: update configuration files --- justfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/justfile b/justfile index b675064..3e25b87 100644 --- a/justfile +++ b/justfile @@ -6,6 +6,11 @@ default: composer *args: just _exec php composer {{ args }} +alias phpunit := test + +test *args: + just _run phpunit {{ args }} + drush *args: just _exec php drush {{ args }} @@ -17,3 +22,6 @@ install *args: _exec +args: docker compose exec {{ args }} + +_run command *args: + docker compose run --rm --no-deps --entrypoint {{ command }} --tty php {{ args }} From 807e06b2120c81e5331213b7821cf083e3fe1a62 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 12 Apr 2023 22:40:22 +0100 Subject: [PATCH 17/65] build: update configuration files --- docker-compose.yaml | 2 ++ justfile | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 9260c27..6da46e7 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -73,3 +73,5 @@ volumes: networks: web: name: traefik_proxy + +# vim: ft=yaml diff --git a/justfile b/justfile index 3e25b87..6eebfcb 100644 --- a/justfile +++ b/justfile @@ -9,7 +9,7 @@ composer *args: alias phpunit := test test *args: - just _run phpunit {{ args }} + just _run php phpunit {{ args }} drush *args: just _exec php drush {{ args }} @@ -23,5 +23,7 @@ install *args: _exec +args: docker compose exec {{ args }} -_run command *args: - docker compose run --rm --no-deps --entrypoint {{ command }} --tty php {{ args }} +_run service command *args: + docker compose run --rm --no-deps --entrypoint {{ command }} --tty {{ service }} {{ args }} + +# vim: ft=just From 63ddb77eed4aa89fb4fd9b668194b86dde898cbc Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 12 Apr 2023 22:41:27 +0100 Subject: [PATCH 18/65] build: update configuration files --- docker-compose.yaml | 2 -- justfile | 2 -- 2 files changed, 4 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 6da46e7..9260c27 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -73,5 +73,3 @@ volumes: networks: web: name: traefik_proxy - -# vim: ft=yaml diff --git a/justfile b/justfile index 6eebfcb..f5e9f11 100644 --- a/justfile +++ b/justfile @@ -25,5 +25,3 @@ _exec +args: _run service command *args: docker compose run --rm --no-deps --entrypoint {{ command }} --tty {{ service }} {{ args }} - -# vim: ft=just From 84148f63e0a6ff056f0ea965b9f7593789dffb58 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 12 Apr 2023 22:46:34 +0100 Subject: [PATCH 19/65] build: update configuration files --- justfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/justfile b/justfile index f5e9f11..5275975 100644 --- a/justfile +++ b/justfile @@ -24,4 +24,9 @@ _exec +args: docker compose exec {{ args }} _run service command *args: - docker compose run --rm --no-deps --entrypoint {{ command }} --tty {{ service }} {{ args }} + docker compose run \ + --entrypoint {{ command }} \ + --no-deps \ + --rm \ + --tty \ + {{ service }} {{ args }} From 09b5218d395657e43ec9f52d5756b0a6d14c807c Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 12 Apr 2023 22:50:29 +0100 Subject: [PATCH 20/65] build: update configuration files --- phpunit.xml.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index b996820..a9203e8 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,5 +1,5 @@ - + Date: Wed, 12 Apr 2023 23:07:12 +0100 Subject: [PATCH 21/65] build: update configuration files --- phpunit.xml.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index a9203e8..ceda784 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -2,7 +2,7 @@ Date: Sun, 16 Apr 2023 21:35:02 +0100 Subject: [PATCH 22/65] build: opt in to new database credentials --- .env.example | 6 +++--- build.yaml | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.env.example b/.env.example index f3b9e70..a050f97 100644 --- a/.env.example +++ b/.env.example @@ -7,6 +7,6 @@ export COMPOSE_PROFILES=web,php,database export DOCKER_WEB_VOLUME=.:/app -export MYSQL_DATABASE=drupal -export MYSQL_PASSWORD=drupal -export MYSQL_USER=drupal +export MYSQL_DATABASE=app +export MYSQL_PASSWORD=app +export MYSQL_USER=app diff --git a/build.yaml b/build.yaml index a92ade3..d168977 100644 --- a/build.yaml +++ b/build.yaml @@ -54,3 +54,6 @@ dockerfile: - phpcs -vv - phpstan - phpunit --testdox + +experimental: + useNewDatabaseCredentials: true From e1be2cfef7306a35d9d3d9ac3443e3da1eabe348 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 21 Apr 2023 13:24:13 +0100 Subject: [PATCH 23/65] build: update configuration files --- justfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/justfile b/justfile index 5275975..b3b44b5 100644 --- a/justfile +++ b/justfile @@ -28,5 +28,5 @@ _run service command *args: --entrypoint {{ command }} \ --no-deps \ --rm \ - --tty \ + -T \ {{ service }} {{ args }} From 467785b8b5dacbabe3659cd2afa5b40e55641492 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 21 Apr 2023 22:38:49 +0100 Subject: [PATCH 24/65] build-configs(update) --- .env.example | 2 +- Dockerfile | 2 +- docker-compose.yaml | 2 +- justfile | 2 +- phpcs.xml.dist | 2 +- phpstan.neon.dist | 2 +- phpunit.xml.dist | 2 +- .../docker/images/php/root/usr/local/bin/docker-entrypoint-php | 2 +- tools/docker/images/web/root/etc/nginx/conf.d/default.conf | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.env.example b/.env.example index a050f97..54c1c13 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ -# Do not edit this file. It is automatically generated by '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 3b7316e..3f21e5f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# Do not edit this file. It is automatically generated by '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 diff --git a/docker-compose.yaml b/docker-compose.yaml index 9260c27..f9cadc3 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,4 +1,4 @@ -# Do not edit this file. It is automatically generated by 'build-configs'. +# Do not edit this file. It is automatically generated by https://www.oliverdavies.uk/build-configs. x-proxy: &default-proxy networks: diff --git a/justfile b/justfile index b3b44b5..ede7928 100644 --- a/justfile +++ b/justfile @@ -1,4 +1,4 @@ -# Do not edit this file. It is automatically generated by '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 418b137..c990e28 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 b629b09..5901cfc 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -1,4 +1,4 @@ -# Do not edit this file. It is automatically generated by '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 ceda784..179546d 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,5 +1,5 @@ - + Date: Sun, 23 Apr 2023 17:20:56 +0100 Subject: [PATCH 25/65] build-configs(update) --- phpcs.xml.dist | 5 +++-- phpstan.neon.dist | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/phpcs.xml.dist b/phpcs.xml.dist index c990e28..1da1b94 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -5,5 +5,6 @@ PHPCS configuration file for docker-example-drupal-localgov. src - - + + + diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 5901cfc..338213d 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -2,6 +2,8 @@ parameters: level: max + excludePaths: + - *Test.php + - *TestBase.php paths: - - src - \ No newline at end of file + - src \ No newline at end of file From 866402165a8127b00291f2d4d82422cd3b781018 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 23 Apr 2023 17:38:17 +0100 Subject: [PATCH 26/65] build-configs(update) --- phpcs.xml.dist | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 1da1b94..76a98ac 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -3,8 +3,11 @@ PHPCS configuration file for docker-example-drupal-localgov. - src + + + + From 50d65ec9615e89ccecb1dc9762830b89c94dcabe Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 23 Apr 2023 20:16:52 +0100 Subject: [PATCH 27/65] build-configs(update) --- phpcs.xml.dist | 13 ++++++------- phpstan.neon.dist | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 76a98ac..ab86a8b 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -2,12 +2,11 @@ - PHPCS configuration file for docker-example-drupal-localgov. + PHPCS configuration file for docker-example-drupal-localgov. - - + + - - - - + + + diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 338213d..bec183f 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -6,4 +6,4 @@ parameters: - *Test.php - *TestBase.php paths: - - src \ No newline at end of file + - src From d8b805fc130051c2ef679c765c03979d5c2454ce Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 23 Apr 2023 20:47:31 +0100 Subject: [PATCH 28/65] build-configs(update) --- phpcs.xml.dist | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/phpcs.xml.dist b/phpcs.xml.dist index ab86a8b..81bd8ac 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -9,4 +9,23 @@ + + + + + + + + + + + + + + + + + + + From 455297ea2ab7e2cbfd44d72456b57916735072c2 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Mon, 24 Apr 2023 20:28:12 +0100 Subject: [PATCH 29/65] build-configs(update) --- .dockerignore | 1 - justfile | 11 +++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index 6b276be..42366c5 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1 @@ -/.github /README.md diff --git a/justfile b/justfile index ede7928..6e905ba 100644 --- a/justfile +++ b/justfile @@ -3,6 +3,15 @@ default: @just --list +# Start the project +start: + cp -v --no-clobber .env.example .env + docker compose up -d + +# Stop the project +stop: + docker compose down + composer *args: just _exec php composer {{ args }} @@ -30,3 +39,5 @@ _run service command *args: --rm \ -T \ {{ service }} {{ args }} + +# vim: ft=just From 8006fb5169204cc46369d745bcf1f331ec4fd86c Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Mon, 24 Apr 2023 23:00:53 +0100 Subject: [PATCH 30/65] build-configs(update) --- justfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/justfile b/justfile index 6e905ba..29db2b8 100644 --- a/justfile +++ b/justfile @@ -18,7 +18,7 @@ composer *args: alias phpunit := test test *args: - just _run php phpunit {{ args }} + just _run php phpunit --colors=always {{ args }} drush *args: just _exec php drush {{ args }} @@ -29,6 +29,7 @@ install *args: + _exec +args: docker compose exec {{ args }} From ac1026847d0f8d400dde6d848c3be049c235b005 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 9 May 2023 19:55:22 +0100 Subject: [PATCH 31/65] build-configs(update) --- Dockerfile | 2 +- docker-compose.yaml | 30 ------------------------------ 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3f21e5f..bdc0fdc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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* ./ diff --git a/docker-compose.yaml b/docker-compose.yaml index f9cadc3..acf6c26 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -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 From ceec7e4b0885b4d52a07ef9e2dc0a52c043aa176 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 9 May 2023 20:15:34 +0100 Subject: [PATCH 32/65] build-configs(update) --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index acf6c26..530b59c 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -28,7 +28,7 @@ x-app: &default-app tty: true services: - + php: <<: *default-app build: From a59a55b0d20313b131b1c9769dc49f1ec3e6db10 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 9 May 2023 20:31:31 +0100 Subject: [PATCH 33/65] build-configs(update) --- justfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/justfile b/justfile index 29db2b8..1706ab8 100644 --- a/justfile +++ b/justfile @@ -18,7 +18,7 @@ composer *args: alias phpunit := test test *args: - just _run php phpunit --colors=always {{ args }} + just _exec php phpunit --colors=always {{ args }} drush *args: just _exec php drush {{ args }} From 609e8ac2c2f71daf50a395599c6e10b8041df0b4 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 9 May 2023 21:04:07 +0100 Subject: [PATCH 34/65] build-configs(update) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bdc0fdc..3f21e5f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 bcmath gd pdo_mysql zip +RUN docker-php-ext-install gd pdo_mysql zip COPY --chown=app:app phpunit.xml* ./ From a5a1f298cc16879f41a1c9397d0b7997d715ff19 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 9 May 2023 21:32:37 +0100 Subject: [PATCH 35/65] build-configs(update) --- .env.example | 2 +- Dockerfile | 2 +- docker-compose.yaml | 2 +- justfile | 2 +- phpcs.xml.dist | 2 +- phpstan.neon.dist | 2 +- phpunit.xml.dist | 2 +- .../docker/images/php/root/usr/local/bin/docker-entrypoint-php | 2 +- tools/docker/images/web/root/etc/nginx/conf.d/default.conf | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.env.example b/.env.example index 54c1c13..be25a42 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ -# Do not edit this file. It is automatically generated by https://www.oliverdavies.uk/build-configs. +# Do not edit this file. It is automatically generated by https://oliverdavies.dev/build-configs. export DOCKER_UID=1000 diff --git a/Dockerfile b/Dockerfile index 3f21e5f..0551570 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# Do not edit this file. It is automatically generated by https://www.oliverdavies.uk/build-configs. +# Do not edit this file. It is automatically generated by https://oliverdavies.dev/build-configs. FROM php:8.1-fpm-bullseye AS base diff --git a/docker-compose.yaml b/docker-compose.yaml index 530b59c..29f5174 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,4 +1,4 @@ -# Do not edit this file. It is automatically generated by https://www.oliverdavies.uk/build-configs. +# Do not edit this file. It is automatically generated by https://oliverdavies.dev/build-configs. x-proxy: &default-proxy networks: diff --git a/justfile b/justfile index 1706ab8..94b0c35 100644 --- a/justfile +++ b/justfile @@ -1,4 +1,4 @@ -# Do not edit this file. It is automatically generated by https://www.oliverdavies.uk/build-configs. +# Do not edit this file. It is automatically generated by https://oliverdavies.dev/build-configs. default: @just --list diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 81bd8ac..a2eaa23 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 bec183f..0658052 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -1,4 +1,4 @@ -# Do not edit this file. It is automatically generated by https://www.oliverdavies.uk/build-configs. +# Do not edit this file. It is automatically generated by https://oliverdavies.dev/build-configs. parameters: level: max diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 179546d..1dbab8f 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,5 +1,5 @@ - + Date: Thu, 11 May 2023 20:53:20 +0100 Subject: [PATCH 36/65] build-configs(update) --- justfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/justfile b/justfile index 94b0c35..71420ec 100644 --- a/justfile +++ b/justfile @@ -20,6 +20,9 @@ alias phpunit := test test *args: just _exec php phpunit --colors=always {{ args }} +test-watch *args: + nodemon --ext "*" --watch "." --exec "just test || exit 1" --ignore */sites/simpletest + drush *args: just _exec php drush {{ args }} @@ -31,7 +34,7 @@ install *args: _exec +args: - docker compose exec {{ args }} + docker compose exec -T {{ args }} _run service command *args: docker compose run \ From d8570511df252f66c988e108c40471f733efdf9d Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 27 May 2023 08:03:41 +0100 Subject: [PATCH 37/65] ci: delete the original failing workflow --- .github/workflows/test.yml | 175 ------------------------------------- 1 file changed, 175 deletions(-) delete mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index 8e2b08b..0000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,175 +0,0 @@ -## -# Managed by https://github.com/localgovdrupal/github_workflow_manager ---- -name: Test localgovdrupal/localgov-project project - -on: - push: - branches: - - '2.x' - pull_request: - branches: - - '2.x' - schedule: - - cron: "0 7 * * *" - -env: - LOCALGOV_DRUPAL_PROJECT: localgovdrupal/localgov-project - LOCALGOV_DRUPAL_PROJECT_PATH: - -jobs: - - build: - name: Install LocalGov Drupal - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - localgov-version: ["2.x"] - drupal-version: ["~9.1"] - php-version: ["7.4","8.1"] - - steps: - - - name: Save git branch and git repo names to env if this is not a pull request - if: github.event_name != 'pull_request' - run: | - echo "GIT_BASE=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV - echo "GIT_BRANCH=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV - echo "GIT_REPO=${GITHUB_REPOSITORY}" >> $GITHUB_ENV - - - name: Save git branch and git repo names to env if this is a pull request - if: github.event_name == 'pull_request' - run: | - echo "GIT_BASE=${GITHUB_BASE_REF}" >> $GITHUB_ENV - echo "GIT_BRANCH=${GITHUB_HEAD_REF}" >> $GITHUB_ENV - echo "GIT_REPO=${{ github.event.pull_request.head.repo.full_name }}" >> $GITHUB_ENV - - - name: Set composer branch reference for version branches - if: endsWith(github.ref, '.x') - run: echo "COMPOSER_REF=${GIT_BRANCH}-dev" >> $GITHUB_ENV - - - name: Set composer branch reference for non-version branches - if: endsWith(github.ref, '.x') == false - run: echo "COMPOSER_REF=dev-${GIT_BRANCH}" >> $GITHUB_ENV - - - name: Cached workspace - uses: actions/cache@v2 - with: - path: ./html - key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }} - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php-version }} - - - name: Clone drupal_container - uses: actions/checkout@v2 - with: - repository: localgovdrupal/drupal-container - ref: php${{ matrix.php-version }} - - - name: Create LocalGov Drupal project - run: composer create-project --stability dev localgovdrupal/localgov-project:${COMPOSER_REF} ./html - - phpcs: - name: Coding standards checks - needs: build - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - localgov-version: ["2.x"] - drupal-version: ["~9.1"] - php-version: ["7.4","8.1"] - - steps: - - - name: Cached workspace - uses: actions/cache@v2 - with: - path: ./html - key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }} - restore-keys: | - localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}- - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php-version }} - - - name: Run coding standards checks - run: | - cd html - ./bin/phpcs -p ${LOCALGOV_DRUPAL_PROJECT_PATH} - - phpstan: - name: Deprecated code checks - needs: build - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - localgov-version: ["2.x"] - drupal-version: ["~9.1"] - php-version: ["7.4","8.1"] - - steps: - - - name: Cached workspace - uses: actions/cache@v2 - with: - path: ./html - key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }} - restore-keys: | - localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}- - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php-version }} - - - name: Run deprecated code checks - run: | - cd html - ./bin/phpstan analyse -c ./phpstan.neon ./web/modules/contrib/localgov* ./web/profiles/contrib/localgov* ./web/themes/contrib/localgov* - phpunit: - name: PHPUnit tests - needs: build - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - localgov-version: ["2.x"] - drupal-version: ["~9.1"] - php-version: ["7.4","8.1"] - - steps: - - - name: Clone Drupal container - uses: actions/checkout@v2 - with: - repository: localgovdrupal/drupal-container - ref: php${{ matrix.php-version }} - - - name: Cached workspace - uses: actions/cache@v2 - with: - path: ./html - key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }} - restore-keys: | - localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}- - - - name: Start Docker environment - run: docker-compose -f docker-compose.yml up -d - - - name: Run PHPUnit tests - run: | - mkdir -p ./html/web/sites/simpletest && chmod 777 ./html/web/sites/simpletest - docker exec -t drupal bash -c 'chown docker:docker -R /var/www/html' - docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/paratest --processes=4" From 39b4f42e797ea35506b7fe74825136403836d2d4 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Mon, 5 Jun 2023 23:02:52 +0100 Subject: [PATCH 38/65] build-configs(update) --- Dockerfile | 5 ++++- docker-compose.yaml | 2 +- tools/docker/images/php/root/usr/local/etc/php/php.ini | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 tools/docker/images/php/root/usr/local/etc/php/php.ini diff --git a/Dockerfile b/Dockerfile index 0551570..e583bf6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,9 +25,12 @@ FROM base AS build USER root + RUN apt-get update -yqq \ && apt-get install -yqq --no-install-recommends \ - git libpng-dev libzip-dev mariadb-client unzip + git libjpeg-dev libpng-dev libzip-dev mariadb-client unzip + +RUN docker-php-ext-configure gd --with-jpeg RUN docker-php-ext-install gd pdo_mysql zip diff --git a/docker-compose.yaml b/docker-compose.yaml index 29f5174..2653eb0 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -30,7 +30,7 @@ x-app: &default-app services: php: - <<: *default-app + <<: [, *default-app] build: context: . target: build diff --git a/tools/docker/images/php/root/usr/local/etc/php/php.ini b/tools/docker/images/php/root/usr/local/etc/php/php.ini new file mode 100644 index 0000000..1ce5894 --- /dev/null +++ b/tools/docker/images/php/root/usr/local/etc/php/php.ini @@ -0,0 +1,4 @@ +# Do not edit this file. It is automatically generated by https://oliverdavies.dev/build-configs. + +max_vars_input = 1000 +memory_limit = 128M From 267b9d72fd9ed21b5d7e65b7b9fa4e159e80578b Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Mon, 5 Jun 2023 23:12:15 +0100 Subject: [PATCH 39/65] build-configs(update) --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 2653eb0..abd47f4 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -30,7 +30,7 @@ x-app: &default-app services: php: - <<: [, *default-app] + <<: [*default-app] build: context: . target: build From b359927080998d7265ca12cf4574844598c24717 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 27 Jun 2023 21:24:28 +0100 Subject: [PATCH 40/65] 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 @@ - + Date: Sat, 22 Jul 2023 10:48:12 +0100 Subject: [PATCH 41/65] chore: rename drupal-project to drupal --- build.yaml | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/build.yaml b/build.yaml index d168977..c90e8c7 100644 --- a/build.yaml +++ b/build.yaml @@ -1,6 +1,6 @@ name: docker-example-drupal-localgov language: php -type: drupal-project +type: drupal web: type: nginx @@ -21,39 +21,18 @@ drupal: docker-compose: services: - database: ~ - php: - build: - target: build + - database + - php + - web dockerfile: stages: build: - extends: base - packages: - - git - - libpng-dev - - libzip-dev - - mariadb-client - - unzip - extensions: - install: - - gd - - pdo_mysql - - zip commands: - composer validate --strict - composer install extra_directories: - assets - test: - extends: base - commands: - - parallel-lint src --no-progress - - phpcs -vv - - phpstan - - phpunit --testdox - experimental: useNewDatabaseCredentials: true From 6625dcac35641295c11f6de31e167f6b8e634f07 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 19 Aug 2023 08:46:26 +0100 Subject: [PATCH 42/65] build-configs(update) --- Dockerfile | 10 ---------- docker-compose.yaml | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index d0551a0..c4ef036 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,16 +49,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 7d125fe..0961d4a 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: external: true From 62469837f2715b3f430c1776af93c9831f39a9eb Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 26 Aug 2023 23:36:24 +0100 Subject: [PATCH 43/65] build-configs(update) --- .githooks/prepare-commit-msg | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100755 .githooks/prepare-commit-msg diff --git a/.githooks/prepare-commit-msg b/.githooks/prepare-commit-msg new file mode 100755 index 0000000..d7bf4c7 --- /dev/null +++ b/.githooks/prepare-commit-msg @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Do not edit this file. It is automatically generated by https://www.oliverdavies.uk/build-configs. + +set -euo pipefail + +# Load the issue ID from an `.issue-id` file within the project and replace the +# `ISSUE_ID` placeholder within a Git commit message. +# +# For example, running `echo "OD-123" > .issue-id` will add `Refs: OD-123` to +# the commit message. +# +# This also works with multiple issue IDs in the same string, e.g. +# "OD-123 OD-456". + +PROJECT_DIR=$(git rev-parse --show-toplevel) # Get the root directory of the repo +ISSUE_FILE="$PROJECT_DIR/.issue-id" + +if [ -f "${ISSUE_FILE}" ]; then + ISSUE_ID=$(cat "${ISSUE_FILE}" | sed 's/ /, /g') + + if [ -n "${ISSUE_ID}" ]; then + sed -i.bak "s/# Refs:/Refs: $ISSUE_ID/" "$1" + fi +fi From 43449e59eeb90544816cc62d8f3ad1a20b24c481 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 26 Aug 2023 23:45:52 +0100 Subject: [PATCH 44/65] build-configs(update) --- .githooks/prepare-commit-msg | 4 ++-- justfile | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.githooks/prepare-commit-msg b/.githooks/prepare-commit-msg index d7bf4c7..7fa07bc 100755 --- a/.githooks/prepare-commit-msg +++ b/.githooks/prepare-commit-msg @@ -2,8 +2,6 @@ # Do not edit this file. It is automatically generated by https://www.oliverdavies.uk/build-configs. -set -euo pipefail - # Load the issue ID from an `.issue-id` file within the project and replace the # `ISSUE_ID` placeholder within a Git commit message. # @@ -13,6 +11,8 @@ set -euo pipefail # This also works with multiple issue IDs in the same string, e.g. # "OD-123 OD-456". +set -euo pipefail + PROJECT_DIR=$(git rev-parse --show-toplevel) # Get the root directory of the repo ISSUE_FILE="$PROJECT_DIR/.issue-id" diff --git a/justfile b/justfile index d255f5d..d43ad25 100644 --- a/justfile +++ b/justfile @@ -33,6 +33,25 @@ install *args: +# Enable or disable Git hooks +git-hooks command: + #!/usr/bin/env bash + set -euo pipefail + + case "{{ command }}" in + "on") + echo "Enabling Git hooks..." + git config core.hooksPath .githooks + ;; + "off") + echo "Disabling Git hooks..." + git config --unset core.hooksPath + ;; + *) + echo "Error: Invalid argument. Must be either 'on' or 'off'" + ;; + esac + _exec +args: docker compose exec -T {{ args }} From c3474ea6d19cf51287ca866ffa86a05153cceb40 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 27 Aug 2023 00:04:29 +0100 Subject: [PATCH 45/65] build-configs(update) --- .githooks/prepare-commit-msg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.githooks/prepare-commit-msg b/.githooks/prepare-commit-msg index 7fa07bc..29640d0 100755 --- a/.githooks/prepare-commit-msg +++ b/.githooks/prepare-commit-msg @@ -9,7 +9,7 @@ # the commit message. # # This also works with multiple issue IDs in the same string, e.g. -# "OD-123 OD-456". +# "OD-123 OD-456", or IDs on multiple lines. set -euo pipefail @@ -17,9 +17,9 @@ PROJECT_DIR=$(git rev-parse --show-toplevel) # Get the root directory of the rep ISSUE_FILE="$PROJECT_DIR/.issue-id" if [ -f "${ISSUE_FILE}" ]; then - ISSUE_ID=$(cat "${ISSUE_FILE}" | sed 's/ /, /g') + ISSUE_IDS=$(cat "${ISSUE_FILE}" | tr '\n' ',' | tr ' ' ',' | sed 's/,$//' | sed 's/,/, /g') - if [ -n "${ISSUE_ID}" ]; then - sed -i.bak "s/# Refs:/Refs: $ISSUE_ID/" "$1" + if [ -n "${ISSUE_IDS}" ]; then + sed -i.bak "s/# Refs:/Refs: $ISSUE_IDS/" "$1" fi fi From 25bb2f1d4e5fc0cd28064f1e0e51ff6a1863bdc4 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 27 Aug 2023 00:19:03 +0100 Subject: [PATCH 46/65] build-configs(update) --- .githooks/prepare-commit-msg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.githooks/prepare-commit-msg b/.githooks/prepare-commit-msg index 29640d0..26059bb 100755 --- a/.githooks/prepare-commit-msg +++ b/.githooks/prepare-commit-msg @@ -13,7 +13,7 @@ set -euo pipefail -PROJECT_DIR=$(git rev-parse --show-toplevel) # Get the root directory of the repo +PROJECT_DIR=$(git rev-parse --show-toplevel) ISSUE_FILE="$PROJECT_DIR/.issue-id" if [ -f "${ISSUE_FILE}" ]; then From cd8bbdbb97adf2b31c89e52f5956351bf9c433b7 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 8 Oct 2023 09:46:03 +0100 Subject: [PATCH 47/65] build-configs(update) --- .gitignore | 114 ++++++++++++++---------------------------- docker-compose.yaml | 1 + justfile | 67 ------------------------- phpcs.xml.dist | 4 +- phpstan.neon.dist | 2 +- run | 118 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 159 insertions(+), 147 deletions(-) delete mode 100644 justfile create mode 100755 run diff --git a/.gitignore b/.gitignore index e8b9513..6227464 100644 --- a/.gitignore +++ b/.gitignore @@ -1,79 +1,39 @@ -# Ignore directories generated by Composer -/bin -/drush/contrib/ -/vendor/ -/web/core/ -/web/modules/contrib/ -/web/themes/contrib/ -/web/profiles/contrib/ -/web/libraries/ +# Do not edit this file. It is automatically generated by https://www.oliverdavies.uk/build-configs. -# Ignore composer.lock as this is template project -/composer.lock +.editorconfig +.env +.gitattributes +vendor/ +web/.csslintrc +web/.eslintignore +web/.eslintrc.json +web/.ht.router.php +web/.htaccess +web/INSTALL.txt +web/README.md +web/autoload.php +web/core/ +web/example.gitignore +web/index.php +web/modules/README.txt +web/modules/contrib/ +web/profiles/README.txt +web/robots.txt +web/sites/*/files/ +web/sites/*/private/ +web/sites/*/services*.yml +web/sites/*/settings*.php +web/sites/README.txt +web/sites/default/default.services.yml +web/sites/default/default.settings.php +web/sites/development.services.yml +web/sites/example.settings.local.php +web/sites/example.sites.php +web/sites/simpletest/ +web/themes/README.txt +web/themes/contrib/ +web/update.php +web/web.config -# Ignore sensitive information -/web/sites/*/settings*.php -/web/sites/*/services*.yml - -# Ignore Drupal's file directory -/web/sites/*/files/ - -# Ignore scaffold files -/.editorconfig -/.gitattributes -/web/.csslintrc -/web/.eslintignore -/web/.eslintrc.json -/web/.gitignore -/web/.ht.router.php -/web/.htaccess -/web/INSTALL.txt -/web/README.md -/web/README.txt -/web/autoload.php -/web/example.gitignore -/web/index.php -/web/modules/README.txt -/web/profiles/README.txt -/web/robots.txt -/web/sites/README.txt -/web/sites/default/default.services.yml -/web/sites/default/default.settings.php -/web/sites/development.services.yml -/web/sites/example.settings.local.php -/web/sites/example.sites.php -/web/themes/README.txt -/web/update.php -/web/web.config - -# Ignore SimpleTest multi-site environment -/web/sites/simpletest - -# Ignore IDE files -.idea/ -.vscode/ - -# Ignore .env files as they are personal -/.env - -# Ignore DB dumps -*.sql -*.sql.gz -*.mysql -*.mysql.gz - -# Ignore Lando overrides -.lando.local.yml - -# Ignore Lando Solr config -/.lando/solr - -# Ignore temp files -/.phpunit.result.cache - -# Ignore ddev configuration folders -.ddev/.global_commands/ -.ddev/commands/ -.ddev/homeadditions/ -.ddev/providers/ -.ddev/xhprof/ +# Docker +/docker-compose.override.yml diff --git a/docker-compose.yaml b/docker-compose.yaml index 0961d4a..fa1f56c 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -70,6 +70,7 @@ services: volumes: db-data: {} + networks: web: external: true diff --git a/justfile b/justfile deleted file mode 100644 index d43ad25..0000000 --- a/justfile +++ /dev/null @@ -1,67 +0,0 @@ -# Do not edit this file. It is automatically generated by https://www.oliverdavies.uk/build-configs. - - -default: - @just --list - -# Start the project -start: - cp -v --no-clobber .env.example .env - docker compose up -d - -# Stop the project -stop: - docker compose down - -composer *args: - just _exec php composer {{ args }} - -alias phpunit := test - -test *args: - just _exec php phpunit --colors=always {{ args }} - -test-watch *args: - nodemon --ext "*" --watch "." --exec "just test || exit 1" --ignore */sites/simpletest - -drush *args: - just _exec php drush {{ args }} - -install *args: - just _exec php drush site:install -y {{ args }} - - - - -# Enable or disable Git hooks -git-hooks command: - #!/usr/bin/env bash - set -euo pipefail - - case "{{ command }}" in - "on") - echo "Enabling Git hooks..." - git config core.hooksPath .githooks - ;; - "off") - echo "Disabling Git hooks..." - git config --unset core.hooksPath - ;; - *) - echo "Error: Invalid argument. Must be either 'on' or 'off'" - ;; - esac - - -_exec +args: - docker compose exec -T {{ args }} - -_run service command *args: - docker compose run \ - --entrypoint {{ command }} \ - --no-deps \ - --rm \ - -T \ - {{ service }} {{ args }} - -# vim: ft=just diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 81bd8ac..5613bdb 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -9,7 +9,7 @@ - + @@ -28,4 +28,4 @@ - + diff --git a/phpstan.neon.dist b/phpstan.neon.dist index bec183f..f2d48e1 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -6,4 +6,4 @@ parameters: - *Test.php - *TestBase.php paths: - - src + diff --git a/run b/run new file mode 100755 index 0000000..642e8a1 --- /dev/null +++ b/run @@ -0,0 +1,118 @@ +#!/usr/bin/env bash + +# Do not edit this file. It is automatically generated by https://www.oliverdavies.uk/build-configs. + +set -eu + +# Run automated tests as part of the Continuous Integration (CI) pipeline. +function ci:test { + lint:dockerfile + + docker compose version + + docker network create traefik_proxy + + cp --no-clobber .env.example .env + + docker compose build --progress plain + + docker compose up --detach + docker compose logs + + composer install --quiet --no-progress + + test --testdox + + quality +} + +# Run a command within the php container. +function cmd { + docker compose exec php "${@}" +} + +function coding-standards { + cmd phpcs "${@}" +} + +function composer { + _exec php composer "${@}" +} + +function drush { + _exec php drush "${@}" +} + +function git-hooks:off { + git config --unset core.hooksPath +} + +function git-hooks:on { + git config core.hooksPath .githooks +} + +# Display a list of all available commands. +function help { + printf "%s [args]\n\nTasks:\n" "${0}" + + compgen -A function | grep -v "^_" | cat -n + + printf "\nExtended help:\n Each task has comments for general usage\n" +} + +function lint:dockerfile { + docker container run --rm -i \ + hadolint/hadolint hadolint --ignore DL3008 --ignore DL3059 -t style "${@}" - < Dockerfile +} + +function quality { + coding-standards + static-analysis +} + +function start { + cp -v --no-clobber .env.example .env + + docker compose up -d +} + +function static-analysis { + cmd phpstan --memory-limit=-1 --no-progress "${@}" +} + +function stop { + docker compose down +} + +function test { + _exec php phpunit --colors=always "${@}" +} + +function test:commit { + test --testdox --testsuite functional + test --testdox --testsuite kernel + test --testdox --testsuite unit + + quality +} + +function _exec { + docker compose exec -T "${@}" +} + +function _run { + local service="${1}" + local command="${2}" + + docker compose run \ + --entrypoint "${command}" \ + --no-deps \ + --rm \ + -T \ + "${service}" "${@}" +} + +TIMEFORMAT=$'\nTask completed in %3lR' +time "${@:-help}" + +# vim: ft=bash From 5bf42e0ca2e51264297460a854810d8a1c810686 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 8 Oct 2023 17:23:32 +0100 Subject: [PATCH 48/65] build-configs(update) --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6227464..1a386ea 100644 --- a/.gitignore +++ b/.gitignore @@ -35,5 +35,5 @@ web/themes/contrib/ web/update.php web/web.config -# Docker -/docker-compose.override.yml +.env +docker-compose.override.yaml From 1658e9c36433caaf3e8f896ce6c03aa8a3e54e2f Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 8 Oct 2023 17:33:12 +0100 Subject: [PATCH 49/65] build-configs(update) --- .gitignore | 1 + Dockerfile | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 1a386ea..8f526a8 100644 --- a/.gitignore +++ b/.gitignore @@ -35,5 +35,6 @@ web/themes/contrib/ web/update.php web/web.config +# Docker. .env docker-compose.override.yaml diff --git a/Dockerfile b/Dockerfile index c4ef036..dd501b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,6 +29,8 @@ USER root RUN apt-get update -yqq \ && apt-get install -yqq --no-install-recommends \ git libpng-dev libjpeg-dev libzip-dev mariadb-client unzip + && rm -rf /var/lib/apt/lists/* /usr/share/doc /usr/share/man \ + && apt-get clean RUN docker-php-ext-configure gd --with-jpeg From 00a1f3edda54951feee41936dfb8bb1ea6dec411 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 8 Oct 2023 17:33:56 +0100 Subject: [PATCH 50/65] build-configs(update) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dd501b9..e0b3f71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,7 +28,7 @@ USER root RUN apt-get update -yqq \ && apt-get install -yqq --no-install-recommends \ - git libpng-dev libjpeg-dev libzip-dev mariadb-client unzip + git libpng-dev libjpeg-dev libzip-dev mariadb-client unzip \ && rm -rf /var/lib/apt/lists/* /usr/share/doc /usr/share/man \ && apt-get clean From 46271ee1452c4a1dd70f9373e69c2dfb06e0d1b1 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Mon, 9 Oct 2023 08:47:59 +0100 Subject: [PATCH 51/65] build-configs(update) --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 8f526a8..e437d14 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,10 @@ web/themes/contrib/ web/update.php web/web.config +# Databases. +*.sql +*.sql.* + # Docker. .env docker-compose.override.yaml From 424f9a66f5b0e6d482e2ac9d743a436984fbd060 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 14 Nov 2023 13:04:17 +0000 Subject: [PATCH 52/65] build-configs(update) --- .gitignore | 6 ++---- run | 3 +++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e437d14..f1df0c3 100644 --- a/.gitignore +++ b/.gitignore @@ -35,10 +35,8 @@ web/themes/contrib/ web/update.php web/web.config -# Databases. -*.sql -*.sql.* - # Docker. .env docker-compose.override.yaml + + diff --git a/run b/run index 642e8a1..233f613 100755 --- a/run +++ b/run @@ -112,6 +112,9 @@ function _run { "${service}" "${@}" } +# Include any local tasks. +source run.local || true + TIMEFORMAT=$'\nTask completed in %3lR' time "${@:-help}" From 03e0977a88987077c8ea9f6e0f978dca3a3f87f2 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 22 Nov 2023 23:01:04 +0000 Subject: [PATCH 53/65] build-configs: disable PHPUnit, PHPCS and PHPStan --- build.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/build.yaml b/build.yaml index c90e8c7..326865d 100644 --- a/build.yaml +++ b/build.yaml @@ -11,10 +11,9 @@ database: php: version: 8.1-fpm-bullseye - phpcs: - standard: Drupal,DrupalPractice - phpstan: - level: max + phpcs: false + phpstan: false + phpunit: false drupal: docroot: web From 9ea05ff9aa616c2346930e89ca61d25072095af7 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 22 Nov 2023 23:01:22 +0000 Subject: [PATCH 54/65] build-configs(update) --- run | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/run b/run index 233f613..b209933 100755 --- a/run +++ b/run @@ -2,7 +2,8 @@ # Do not edit this file. It is automatically generated by https://www.oliverdavies.uk/build-configs. -set -eu +set -o errexit +set -o pipefail # Run automated tests as part of the Continuous Integration (CI) pipeline. function ci:test { @@ -21,9 +22,7 @@ function ci:test { composer install --quiet --no-progress - test --testdox - quality } # Run a command within the php container. @@ -31,9 +30,6 @@ function cmd { docker compose exec php "${@}" } -function coding-standards { - cmd phpcs "${@}" -} function composer { _exec php composer "${@}" @@ -65,10 +61,6 @@ function lint:dockerfile { hadolint/hadolint hadolint --ignore DL3008 --ignore DL3059 -t style "${@}" - < Dockerfile } -function quality { - coding-standards - static-analysis -} function start { cp -v --no-clobber .env.example .env @@ -76,22 +68,13 @@ function start { docker compose up -d } -function static-analysis { - cmd phpstan --memory-limit=-1 --no-progress "${@}" -} function stop { docker compose down } -function test { - _exec php phpunit --colors=always "${@}" -} function test:commit { - test --testdox --testsuite functional - test --testdox --testsuite kernel - test --testdox --testsuite unit quality } @@ -113,7 +96,7 @@ function _run { } # Include any local tasks. -source run.local || true +[[ -e run.local ]] && source run.local TIMEFORMAT=$'\nTask completed in %3lR' time "${@:-help}" From 3b2d838337f58912491ce049ded6f8da02dd1cf0 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 23 Nov 2023 07:06:03 +0000 Subject: [PATCH 55/65] build-configs(update) --- .githooks/prepare-commit-msg | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.githooks/prepare-commit-msg b/.githooks/prepare-commit-msg index 26059bb..6ff8ea0 100755 --- a/.githooks/prepare-commit-msg +++ b/.githooks/prepare-commit-msg @@ -11,7 +11,9 @@ # This also works with multiple issue IDs in the same string, e.g. # "OD-123 OD-456", or IDs on multiple lines. -set -euo pipefail +set -o errexit +set -o nounset +set -o pipefail PROJECT_DIR=$(git rev-parse --show-toplevel) ISSUE_FILE="$PROJECT_DIR/.issue-id" From 94f8f64ed23a768a3ba844b59c483ec6fbba897b Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 16 Dec 2023 09:02:58 +0000 Subject: [PATCH 56/65] Update build configuration files --- run | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/run b/run index b209933..bb43b7e 100755 --- a/run +++ b/run @@ -5,6 +5,13 @@ set -o errexit set -o pipefail +# If we're running in CI we need to disable TTY allocation for docker compose +# commands that enable it by default, such as exec and run. +TTY="${TTY:-}" +if [[ ! -t 1 ]]; then + TTY="-T" +fi + # Run automated tests as part of the Continuous Integration (CI) pipeline. function ci:test { lint:dockerfile @@ -80,7 +87,7 @@ function test:commit { } function _exec { - docker compose exec -T "${@}" + docker compose exec ${TTY} "${@}" } function _run { @@ -91,7 +98,7 @@ function _run { --entrypoint "${command}" \ --no-deps \ --rm \ - -T \ + ${TTY} \ "${service}" "${@}" } From 553ab7c8270714c6f1193980525218adb990381c Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 16 Dec 2023 17:08:55 +0000 Subject: [PATCH 57/65] Update build configuration files --- run | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/run b/run index bb43b7e..89437e2 100755 --- a/run +++ b/run @@ -63,6 +63,11 @@ function help { printf "\nExtended help:\n Each task has comments for general usage\n" } +# Install Drupal. +function install { + drush site:install -y "${@}" +} + function lint:dockerfile { docker container run --rm -i \ hadolint/hadolint hadolint --ignore DL3008 --ignore DL3059 -t style "${@}" - < Dockerfile From 512c8160c270310d38ab826c1c28d8bc0da26ad6 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 21 Jan 2024 21:58:49 +0000 Subject: [PATCH 58/65] Update build configuration files --- run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run b/run index 89437e2..da6a3ee 100755 --- a/run +++ b/run @@ -75,7 +75,7 @@ function lint:dockerfile { function start { - cp -v --no-clobber .env.example .env + cp -v --no-clobber .env.example .env || true docker compose up -d } From cce16ab4e6ceaa74f24ebdad22cc89321832c9c2 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 10 May 2024 23:55:24 +0200 Subject: [PATCH 59/65] Update build configuration files --- .gitignore | 2 +- Dockerfile | 2 +- docker-compose.yaml | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f1df0c3..01d9ebb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ .editorconfig .env .gitattributes +.phpunit.result.cache vendor/ web/.csslintrc web/.eslintignore @@ -39,4 +40,3 @@ web/web.config .env docker-compose.override.yaml - diff --git a/Dockerfile b/Dockerfile index e0b3f71..b218199 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,7 +34,7 @@ RUN apt-get update -yqq \ 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* ./ diff --git a/docker-compose.yaml b/docker-compose.yaml index fa1f56c..f6453f6 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -5,10 +5,12 @@ x-proxy: &default-proxy - default - web labels: + - "traefik.enable=true" - "traefik.docker.network=traefik_proxy" - "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 volumes: @@ -24,7 +26,7 @@ x-app: &default-app cpus: "${DOCKER_MYSQL_CPUS:-0}" memory: "${DOCKER_MYSQL_MEMORY:-0}" labels: - - "traefik.enabled=false" + - "traefik.enable=false" tty: true services: @@ -63,7 +65,7 @@ services: env_file: - .env labels: - - "traefik.enabled=false" + - "traefik.enable=false" environment: MYSQL_RANDOM_ROOT_PASSWORD: true profiles: [database] From 96ad13a7ea716c4e8b017d65ff843c3966c70065 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 11 May 2024 00:00:44 +0200 Subject: [PATCH 60/65] Update build configuration files --- docker-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index f6453f6..dcbebe0 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,7 +3,7 @@ x-proxy: &default-proxy networks: - default - - web + - proxy labels: - "traefik.enable=true" - "traefik.docker.network=traefik_proxy" @@ -74,6 +74,6 @@ volumes: db-data: {} networks: - web: + proxy: external: true name: traefik_proxy From 05c1c9d9696353c00bf2d03d41a2d8974b24ffe2 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 27 Jun 2024 12:16:48 +0100 Subject: [PATCH 61/65] Update build configuration files --- .env.example | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.env.example b/.env.example index 54c1c13..cf41d84 100644 --- a/.env.example +++ b/.env.example @@ -7,6 +7,8 @@ export COMPOSE_PROFILES=web,php,database export DOCKER_WEB_VOLUME=.:/app +export DRUSH_OPTIONS_URI="https://${COMPOSE_PROJECT_NAME}.docker.localhost" + export MYSQL_DATABASE=app export MYSQL_PASSWORD=app export MYSQL_USER=app From f5ee9dbb98689b59d172f5fa5510f6f3cfb988ae Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 17 Jul 2024 20:17:32 +0100 Subject: [PATCH 62/65] Update build configuration files --- run | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/run b/run index da6a3ee..ca8b05d 100755 --- a/run +++ b/run @@ -18,9 +18,9 @@ function ci:test { docker compose version - docker network create traefik_proxy + docker network create traefik_proxy || true - cp --no-clobber .env.example .env + cp --no-clobber .env.example .env || true docker compose build --progress plain @@ -70,7 +70,7 @@ function install { function lint:dockerfile { docker container run --rm -i \ - hadolint/hadolint hadolint --ignore DL3008 --ignore DL3059 -t style "${@}" - < Dockerfile + hadolint/hadolint hadolint --ignore DL3008 --ignore DL3022 --ignore DL3059 -t style "${@}" - < Dockerfile } From ad3e94543ea33ea08b728fd4eb799576acf22d36 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 20 Jul 2024 13:57:18 +0100 Subject: [PATCH 63/65] Update build configuration files --- .env.example | 4 ++++ run | 13 +++++++++++++ 2 files changed, 17 insertions(+) diff --git a/.env.example b/.env.example index cf41d84..a15d515 100644 --- a/.env.example +++ b/.env.example @@ -12,3 +12,7 @@ export DRUSH_OPTIONS_URI="https://${COMPOSE_PROJECT_NAME}.docker.localhost" export MYSQL_DATABASE=app export MYSQL_PASSWORD=app export MYSQL_USER=app + +export DB_NAME="$MYSQL_DATABASE" +export DB_PASSWORD="$MYSQL_PASSWORD" +export DB_USER="$MYSQL_USER" diff --git a/run b/run index ca8b05d..090690d 100755 --- a/run +++ b/run @@ -38,18 +38,29 @@ function cmd { } +# Execute any Composer command. function composer { _exec php composer "${@}" } +# Connect to the database. +function db { + [[ -f ".env" ]] && source .env + + docker compose exec database mysql -u"$DB_USER" -p"$DB_PASSWORD" "$DB_NAME" +} + +# Execute any Drush command. function drush { _exec php drush "${@}" } +# Disable Git hooks. function git-hooks:off { git config --unset core.hooksPath } +# Enable Git hooks. function git-hooks:on { git config core.hooksPath .githooks } @@ -68,12 +79,14 @@ function install { drush site:install -y "${@}" } +# Lint the Dockerfile. function lint:dockerfile { docker container run --rm -i \ hadolint/hadolint hadolint --ignore DL3008 --ignore DL3022 --ignore DL3059 -t style "${@}" - < Dockerfile } +# Start the project. function start { cp -v --no-clobber .env.example .env || true From 34eff4ef8bfee4cca9095e22621e7bdb4322fe39 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 31 Jul 2024 01:21:54 +0100 Subject: [PATCH 64/65] Update build configuration files --- run | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/run b/run index 090690d..8ae65d7 100755 --- a/run +++ b/run @@ -121,7 +121,8 @@ function _run { } # Include any local tasks. -[[ -e run.local ]] && source run.local +# https://stackoverflow.com/a/6659698 +[[ -e "${BASH_SOURCE%/*}/run.local" ]] && source "${BASH_SOURCE%/*}/run.local" TIMEFORMAT=$'\nTask completed in %3lR' time "${@:-help}" From 45d226aaadba53b07a0ff227e3914be226039c84 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Mon, 29 Sep 2025 22:16:27 +0100 Subject: [PATCH 65/65] Move all files to drupal-localgov/ --- .dockerignore => drupal-localgov/.dockerignore | 0 .env.example => drupal-localgov/.env.example | 0 {.githooks => drupal-localgov/.githooks}/prepare-commit-msg | 0 .gitignore => drupal-localgov/.gitignore | 0 .hadolint.yaml => drupal-localgov/.hadolint.yaml | 0 Dockerfile => drupal-localgov/Dockerfile | 0 LICENSE => drupal-localgov/LICENSE | 0 README.md => drupal-localgov/README.md | 0 README.original.md => drupal-localgov/README.original.md | 0 .../assets}/composer/development.services.yml | 0 {assets => drupal-localgov/assets}/composer/settings.lando.php | 0 {assets => drupal-localgov/assets}/composer/settings.php | 0 build.yaml => drupal-localgov/build.yaml | 0 composer.json => drupal-localgov/composer.json | 0 {config => drupal-localgov/config}/sync/.htaccess | 0 docker-compose.yaml => drupal-localgov/docker-compose.yaml | 0 phpcs.xml.dist => drupal-localgov/phpcs.xml.dist | 0 phpstan.neon => drupal-localgov/phpstan.neon | 0 phpstan.neon.dist => drupal-localgov/phpstan.neon.dist | 0 phpunit.xml.dist => drupal-localgov/phpunit.xml.dist | 0 run => drupal-localgov/run | 0 .../docker/images/php/root/usr/local/bin/docker-entrypoint-php | 0 .../tools}/docker/images/php/root/usr/local/etc/php/php.ini | 0 .../tools}/docker/images/web/root/etc/nginx/conf.d/default.conf | 0 24 files changed, 0 insertions(+), 0 deletions(-) rename .dockerignore => drupal-localgov/.dockerignore (100%) rename .env.example => drupal-localgov/.env.example (100%) rename {.githooks => drupal-localgov/.githooks}/prepare-commit-msg (100%) rename .gitignore => drupal-localgov/.gitignore (100%) rename .hadolint.yaml => drupal-localgov/.hadolint.yaml (100%) rename Dockerfile => drupal-localgov/Dockerfile (100%) rename LICENSE => drupal-localgov/LICENSE (100%) rename README.md => drupal-localgov/README.md (100%) rename README.original.md => drupal-localgov/README.original.md (100%) rename {assets => drupal-localgov/assets}/composer/development.services.yml (100%) rename {assets => drupal-localgov/assets}/composer/settings.lando.php (100%) rename {assets => drupal-localgov/assets}/composer/settings.php (100%) rename build.yaml => drupal-localgov/build.yaml (100%) rename composer.json => drupal-localgov/composer.json (100%) rename {config => drupal-localgov/config}/sync/.htaccess (100%) rename docker-compose.yaml => drupal-localgov/docker-compose.yaml (100%) rename phpcs.xml.dist => drupal-localgov/phpcs.xml.dist (100%) rename phpstan.neon => drupal-localgov/phpstan.neon (100%) rename phpstan.neon.dist => drupal-localgov/phpstan.neon.dist (100%) rename phpunit.xml.dist => drupal-localgov/phpunit.xml.dist (100%) rename run => drupal-localgov/run (100%) rename {tools => drupal-localgov/tools}/docker/images/php/root/usr/local/bin/docker-entrypoint-php (100%) rename {tools => drupal-localgov/tools}/docker/images/php/root/usr/local/etc/php/php.ini (100%) rename {tools => drupal-localgov/tools}/docker/images/web/root/etc/nginx/conf.d/default.conf (100%) diff --git a/.dockerignore b/drupal-localgov/.dockerignore similarity index 100% rename from .dockerignore rename to drupal-localgov/.dockerignore diff --git a/.env.example b/drupal-localgov/.env.example similarity index 100% rename from .env.example rename to drupal-localgov/.env.example diff --git a/.githooks/prepare-commit-msg b/drupal-localgov/.githooks/prepare-commit-msg similarity index 100% rename from .githooks/prepare-commit-msg rename to drupal-localgov/.githooks/prepare-commit-msg diff --git a/.gitignore b/drupal-localgov/.gitignore similarity index 100% rename from .gitignore rename to drupal-localgov/.gitignore diff --git a/.hadolint.yaml b/drupal-localgov/.hadolint.yaml similarity index 100% rename from .hadolint.yaml rename to drupal-localgov/.hadolint.yaml diff --git a/Dockerfile b/drupal-localgov/Dockerfile similarity index 100% rename from Dockerfile rename to drupal-localgov/Dockerfile diff --git a/LICENSE b/drupal-localgov/LICENSE similarity index 100% rename from LICENSE rename to drupal-localgov/LICENSE diff --git a/README.md b/drupal-localgov/README.md similarity index 100% rename from README.md rename to drupal-localgov/README.md diff --git a/README.original.md b/drupal-localgov/README.original.md similarity index 100% rename from README.original.md rename to drupal-localgov/README.original.md diff --git a/assets/composer/development.services.yml b/drupal-localgov/assets/composer/development.services.yml similarity index 100% rename from assets/composer/development.services.yml rename to drupal-localgov/assets/composer/development.services.yml diff --git a/assets/composer/settings.lando.php b/drupal-localgov/assets/composer/settings.lando.php similarity index 100% rename from assets/composer/settings.lando.php rename to drupal-localgov/assets/composer/settings.lando.php diff --git a/assets/composer/settings.php b/drupal-localgov/assets/composer/settings.php similarity index 100% rename from assets/composer/settings.php rename to drupal-localgov/assets/composer/settings.php diff --git a/build.yaml b/drupal-localgov/build.yaml similarity index 100% rename from build.yaml rename to drupal-localgov/build.yaml diff --git a/composer.json b/drupal-localgov/composer.json similarity index 100% rename from composer.json rename to drupal-localgov/composer.json diff --git a/config/sync/.htaccess b/drupal-localgov/config/sync/.htaccess similarity index 100% rename from config/sync/.htaccess rename to drupal-localgov/config/sync/.htaccess diff --git a/docker-compose.yaml b/drupal-localgov/docker-compose.yaml similarity index 100% rename from docker-compose.yaml rename to drupal-localgov/docker-compose.yaml diff --git a/phpcs.xml.dist b/drupal-localgov/phpcs.xml.dist similarity index 100% rename from phpcs.xml.dist rename to drupal-localgov/phpcs.xml.dist diff --git a/phpstan.neon b/drupal-localgov/phpstan.neon similarity index 100% rename from phpstan.neon rename to drupal-localgov/phpstan.neon diff --git a/phpstan.neon.dist b/drupal-localgov/phpstan.neon.dist similarity index 100% rename from phpstan.neon.dist rename to drupal-localgov/phpstan.neon.dist diff --git a/phpunit.xml.dist b/drupal-localgov/phpunit.xml.dist similarity index 100% rename from phpunit.xml.dist rename to drupal-localgov/phpunit.xml.dist diff --git a/run b/drupal-localgov/run similarity index 100% rename from run rename to drupal-localgov/run diff --git a/tools/docker/images/php/root/usr/local/bin/docker-entrypoint-php b/drupal-localgov/tools/docker/images/php/root/usr/local/bin/docker-entrypoint-php similarity index 100% rename from tools/docker/images/php/root/usr/local/bin/docker-entrypoint-php rename to drupal-localgov/tools/docker/images/php/root/usr/local/bin/docker-entrypoint-php diff --git a/tools/docker/images/php/root/usr/local/etc/php/php.ini b/drupal-localgov/tools/docker/images/php/root/usr/local/etc/php/php.ini similarity index 100% rename from tools/docker/images/php/root/usr/local/etc/php/php.ini rename to drupal-localgov/tools/docker/images/php/root/usr/local/etc/php/php.ini diff --git a/tools/docker/images/web/root/etc/nginx/conf.d/default.conf b/drupal-localgov/tools/docker/images/web/root/etc/nginx/conf.d/default.conf similarity index 100% rename from tools/docker/images/web/root/etc/nginx/conf.d/default.conf rename to drupal-localgov/tools/docker/images/web/root/etc/nginx/conf.d/default.conf