GitLab

Change-Id: I27ff3b08bfc0990135a686400814cde34450a4d7

We've got a remote forwarding server that can do SSL termination
so we just need a local port serving on non-SSL. We use the
SetEnvIf directive to let the local server know that HTTPS is
on when the X-Forwarded-Proto is 'https'.

Bug: T291577
Change-Id: Ifa071e5f073332a0804abb8e8b84d3b8b018a531

This is the software we're using to offer donors their own data
when they request it under privacy laws.

Pretty bare-bones, maybe could get away with just using
fundraising-civicrm-buster-php73-apache2, but this gives us the same
central logging and xdebug configurability we have on other
fundraising images.

Bug: T285881
Change-Id: I1ccd58e4f7699cacc037f441452122f5eabfad43

These are no longer used by the development environment.

Also tidies up a few other lingering references to stretch.

Bug: T290532

Bug: T290259

Adds a buster version of the Apache image.

Sends Apache and PHP logs to standard out.

Bug: T283416
Change-Id: I6127d788a58ec0b0b64ac82965a1a4922b3c2005

Bug: T273100
Depends-on: I8ec767b3e3c7039113a7dab95f2c5340121aebdc
Change-Id: I72d4dbce77f2d28f02a3ab360a83f9309e0a1bf6

Brennen Bearnes authored Jun 08, 2021 and Jforrester committed Jul 15, 2021

In preparation for creating a new set of buster-based images for the
main docker-compose setup, it seemed less likely to cause problems &
confusion if we just rename the base image for the FR Tech setup first.

I've built this locally, but not yet tested it with docker-compose.

Bug: T273100
Change-Id: I8ec767b3e3c7039113a7dab95f2c5340121aebdc

Split out from I8ec767b3e3c7039113a7dab95f2c5340121aebdc for ease of review.

Change-Id: I9fc16e1bdd433b1a8579b43d98da7fc2f1ed3c78

Jgleeson authored Feb 17, 2021 and Eileen committed Jul 15, 2021

Manual Setup instructions: https://etherpad.wikimedia.org/p/adfadf-civiproxy

Bug: T268683
Change-Id: Ie9abe17b6adbfb87809f7bd2380044ec35dee9a8

Bug: T268687
Change-Id: I5587d05859d08f3d468ab372ba4ba4608072642f

Wikimedia's CI infrastructure requires that Docker images referenced
as Blubberfile base images come from Wikimedia's own Docker
repository. This commit adds a Swift dev image, building on the
Debian Buster dev image, which can be used for testing.

Bug: T284195
Change-Id: I6db65b589487408f51cbb39967532e398559a4a5

Bug: T262975
Bug: T279669
Bug: T283044
Change-Id: If52af810ae38d2fe294062b9082091ae10fc0175

Brennen Bearnes authored May 18, 2021 and Jeena Huneidi committed Jun 22, 2021

  - Update upstream repo key in stretch-php-sury
  - Move Xdebug config to .env file
  - Update Xdebug

Bug: T273682
Change-Id: I37d0f35f0e3622a7fb3cb095d3b6b9496438ce12

This reverts commit 9d862d5d.

Reason for revert: The original commit changed the wrong git repo.  It should have been in integration/config.  The revised commit is https://gerrit.wikimedia.org/r/c/integration/config/+/680392

Change-Id: Id7691c5be556677f5dbb791c562e6fc4cbaa14da

The stretch-scap-deps image is based on
docker-registry.wikimedia.org/wikimedia-stretch:latest and contains
the packages required for building the scap deb.

Change-Id: Ib6c6e73218c43b26ecfc3b9c437d61c2afd9745d

Bug: T276499
Change-Id: I3c80952e47b81ef9f48b5bd788710c76d1160098

Bug: T262975
Change-Id: I2d15657cd39220fc63439c34d1aa930ce6b4f6d7

This is a flexible container for running rsyslog, initially inteded for use
by FR-Tech as part of a docker-compose development setup.

Bug: T262976
Change-Id: I56d92b1ed9c3c53b6ce02a22efbd3b70bcbf2fe2

This is intended as one of the images to be used in a unified development
setup for Fundraising Tech. In some ways, it is similar to other development
images, though it omits the install.sh script, and provides a site over
https (needed for development with payment processors).

Bug: T262976
Change-Id: Id4f665fc34d84f5e056b0c563f52f08238b9a6f3

This moves xdebug building to each of the versioned PHP images, and some
redundant copies of scripts to the base stretch image, and upgrades to
Xdebug 3.0.1.

It also uses version-specific packages for all PHP dependencies, fixing a
messy situation where both the default (7.4) and other versions were
installed simultaneously in some images, and some libraries unavailable.

Change-Id: Iab57d34b2012eb9e0271a7d4ec02053f984ccf86

php7.2-dba is required for efficient CDB file access.

Note: As far as I can tell there is no php-dba package, which is why I
used php7.2-dba.

Change-Id: I3c350f5c3897eecb224d3ee953614865553f815f

Change-Id: I585f7be6ecebbbefdd0bdf7a921f1f6c7f7b0e30

Jakob authored Nov 18, 2020 and Brennen Bearnes committed Nov 18, 2020

The intention was to replace `MW_SCRIPT_PATH=/` with `MW_SCRIPT_PATH=/w`
in the .env file, but the regex also matched entries that were already
changed to `/w`. Running `docker-compose up` a few times resulted in an
entry like `MW_SCRIPT_PATH=/wwwwwwwwwww`.

Change-Id: Idf25b9a9497d4eb6d8c7e6b7c97b76eb370c3136

Jforrester authored May 22, 2020 and Brennen Bearnes committed Nov 04, 2020

A proposal to split PHP out from the HTTPD so it's a bit more efficient
to provide multiple PHP versions.  Noticed this was getting real clunky.
It's still clunky, but maybe less so if every PHP image doesn't also
come with Apache.

Adds:

  - stretch-php-sury for Sury-specific packages, per hashar
  - PHP 7.2, 7.3, and 7.4 FPM containers
  - A separate Apache container that assumes it can talk to the FPM
    container on mediawiki-php:9000
  - PHP 7.3 & 7.4 jobrunner containers

Rearranges:

  - Moves some utility installation (composer, jq, curl) to parent
    stretch image
  - Moves some PHP dependencies to stretch-php-sury, and configuration
    files into stretch

Potential cons:

  - It's an extra container in the mediawiki-docker environment.
  - Builds in at least one extra docker-compose assumption -
    the aforementioned mediawiki-php hostname.

Also includes php-ast and imagemagick, as requested by users.

Bug: T245444
Bug: T254780
Bug: T246386
Change-Id: I67ed53c4bd8e92a4c506da4aa7ffee79ca2910bb

Bug: T262976
Change-Id: Ia9baeffd1c4966e201256efdfd8e6d60b32f8606

Developers who installed a SQLite database with images <0.5.0 (before
the switch to /var/www/html/w directory structure) will have a broken
system when updating to 0.5.0, because their LocalSettings.php and .env
file assume a differeng script path and directory structure.

This patch updates the existing entrypoint.sh script to detect if the
user's configuration files (LocalSettings.php and .env) need to be
adjusted for the new directory/URL scheme, and makes the changes for
them. It also adds an overdue fix for requiring
PlatformSettings.php (added back in version 0.1.0)

See also I7801f549c887952f5d092651c2543ace6d56e909

To test:

* Clone mediawiki-core in a new directory, run through the installer,
visit http://localhost:8080 in the browser.
* git review -d https://gerrit.wikimedia.org/r/c/mediawiki/core/+/626144
* Run docker-compose up -d; check LocalSettings.php and .env to verify
that the configuration was updated, visiting http://localhost:8080
should work correctly

Bug: T261051
Change-Id: I3d967b610a032625318c5a2d233254f7e7ccbf13

This fixes requests to the rest.php endpoint and sets up URLs in a way
similar to what is used in production and in Vagrant.

See also Id9e62b987699dc2edbed823601a2f0e8e2d45dd0

A corresponding change in core's docker-compose.yml is needed to mount
the local directory to /var/www/html/w.

Bug: T261051
Bug: T262392
Change-Id: I5b0ac1cbb1d1a2381eff757a1903bce2dacf09d0

Change-Id: I2918366460d45a8a4ac5f8e475099322f5f27385

David Barratt authored Jul 03, 2020 and Brennen Bearnes committed Jul 24, 2020

The current article path cannot be customized in MediaWiki's
configuration, because the httpd configuration forces /wiki. Allowing
any path will allow this to be customized by the developer.

Bug: T257044
Change-Id: Idf33d1f431f2936eda4a221c4418d7d5d863b352

  - removes ffmpeg from base "stretch" image, removes bogus "Depends:"
    from stretch/control

  - Adds stretch-php72-jobrunner for running maintenance/runJobs.php
    in a loop.

  - Disables job running in app server with $wgJobRunRate.

  - Adds `make use-cache` for faster local rebuilds.

This also avoids an issue with building stretch-php72-fpm-apache2-xdebug
where an upstream change to php-fpm config was overwriting changes made
in its parent image.

Bug: T247153
Bug: T246942
Bug: T246935
Change-Id: I505366b287f75581a5dd8016abbedfe61f53cb13