jjb: Switch everything to images using composer 2.x not 1.x

Affected jobs:
 - ArticlePlaceholder-phpmetrics-docker
 - Cognate-phpmetrics-docker
 - EntitySchema-phpmetrics-docker
 - PropertySuggester-phpmetrics-docker
 - Wikibase-phpmetrics-docker
 - WikibaseCirrusSearch-phpmetrics-docker
 - WikibaseLexeme-phpmetrics-docker
 - WikibaseLexemeCirrusSearch-phpmetrics-docker
 - WikibaseManifest-phpmetrics-docker
 - WikibaseQualityConstraints-phpmetrics-docker
 - composer-package-php72-docker
 - composer-package-php73-docker
 - composer-package-php74-docker
 - composer-package-php80-docker
 - composer-php72-docker
 - composer-php73-docker
 - composer-php74-docker
 - composer-php80-docker
 - integration-quibble-apache-fullrun
 - integration-quibble-fullrun
 - legacy-quibble-rubyselenium-docker
 - mediawiki-core-php72-phan-docker
 - mediawiki-core-php73-phan-docker
 - mediawiki-core-php74-phan-docker
 - mediawiki-core-php80-phan-docker
 - mediawiki-core-phpmetrics-docker
 - mediawiki-fresnel-patch-docker
 - mediawiki-quibble-api-testing-vendor-mysql-php72-docker
 - mediawiki-quibble-api-testing-vendor-sqlite-php72-docker
 - mediawiki-quibble-apitests-composer-php72-docker
 - mediawiki-quibble-apitests-composer-php73-docker
 - mediawiki-quibble-apitests-composer-php74-docker
 - mediawiki-quibble-apitests-composer-php80-docker
 - mediawiki-quibble-apitests-vendor-php72-docker
 - mediawiki-quibble-apitests-vendor-php73-docker
 - mediawiki-quibble-apitests-vendor-php74-docker
 - mediawiki-quibble-apitests-vendor-php80-docker
 - mediawiki-quibble-composer-mysql-php72-docker
 - mediawiki-quibble-composer-mysql-php73-docker
 - mediawiki-quibble-composer-mysql-php74-docker
 - mediawiki-quibble-composer-mysql-php80-docker
 - mediawiki-quibble-composer-postgres-php72-docker
 - mediawiki-quibble-composer-postgres-php73-docker
 - mediawiki-quibble-composer-postgres-php74-docker
 - mediawiki-quibble-composer-postgres-php80-docker
 - mediawiki-quibble-composer-sqlite-php72-docker
 - mediawiki-quibble-composer-sqlite-php73-docker
 - mediawiki-quibble-composer-sqlite-php74-docker
 - mediawiki-quibble-composer-sqlite-php80-docker
 - mediawiki-quibble-composertest-php72-docker
 - mediawiki-quibble-composertest-php73-docker
 - mediawiki-quibble-composertest-php74-docker
 - mediawiki-quibble-composertest-php80-docker
 - mediawiki-quibble-selenium-composer-mysql-php72-docker
 - mediawiki-quibble-selenium-composer-mysql-php73-docker
 - mediawiki-quibble-selenium-composer-mysql-php74-docker
 - mediawiki-quibble-selenium-composer-mysql-php80-docker
 - mediawiki-quibble-selenium-composer-postgres-php72-docker
 - mediawiki-quibble-selenium-composer-postgres-php73-docker
 - mediawiki-quibble-selenium-composer-postgres-php74-docker
 - mediawiki-quibble-selenium-composer-postgres-php80-docker
 - mediawiki-quibble-selenium-composer-sqlite-php72-docker
 - mediawiki-quibble-selenium-composer-sqlite-php73-docker
 - mediawiki-quibble-selenium-composer-sqlite-php74-docker
 - mediawiki-quibble-selenium-composer-sqlite-php80-docker
 - mediawiki-quibble-selenium-vendor-mysql-php72-docker
 - mediawiki-quibble-selenium-vendor-mysql-php73-docker
 - mediawiki-quibble-selenium-vendor-mysql-php74-docker
 - mediawiki-quibble-selenium-vendor-mysql-php80-docker
 - mediawiki-quibble-selenium-vendor-postgres-php72-docker
 - mediawiki-quibble-selenium-vendor-postgres-php73-docker
 - mediawiki-quibble-selenium-vendor-postgres-php74-docker
 - mediawiki-quibble-selenium-vendor-postgres-php80-docker
 - mediawiki-quibble-selenium-vendor-sqlite-php72-docker
 - mediawiki-quibble-selenium-vendor-sqlite-php73-docker
 - mediawiki-quibble-selenium-vendor-sqlite-php74-docker
 - mediawiki-quibble-selenium-vendor-sqlite-php80-docker
 - mediawiki-quibble-vendor-mysql-php72-docker
 - mediawiki-quibble-vendor-mysql-php73-docker
 - mediawiki-quibble-vendor-mysql-php74-docker
 - mediawiki-quibble-vendor-mysql-php80-docker
 - mediawiki-quibble-vendor-postgres-php72-docker
 - mediawiki-quibble-vendor-postgres-php73-docker
 - mediawiki-quibble-vendor-postgres-php74-docker
 - mediawiki-quibble-vendor-postgres-php80-docker
 - mediawiki-quibble-vendor-sqlite-php72-docker
 - mediawiki-quibble-vendor-sqlite-php73-docker
 - mediawiki-quibble-vendor-sqlite-php74-docker
 - mediawiki-quibble-vendor-sqlite-php80-docker
 - mediawiki-selenium-integration-docker
 - mw-tools-codesniffer-mwcore-testrun
 - mw-tools-phan-demos-publish
 - mw-tools-phan-mwcore-testrun
 - mwcore-codehealth-master-non-voting
 - mwcore-codehealth-patch
 - mwcore-phpunit-coverage-master
 - mwcore-phpunit-coverage-patch
 - mwext-codehealth-master-non-voting
 - mwext-codehealth-patch
 - mwext-php72-phan-docker
 - mwext-php73-phan-docker
 - mwext-php74-phan-docker
 - mwext-php80-phan-docker
 - mwext-phpunit-coverage-docker-publish
 - mwext-phpunit-coverage-patch-docker
 - mwgate-composer-php72-docker
 - mwgate-composer-php73-docker
 - mwgate-composer-php74-docker
 - mwgate-composer-php80-docker
 - mwskin-php72-phan-docker
 - mwskin-php73-phan-docker
 - mwskin-php74-phan-docker
 - mwskin-php80-phan-docker
 - mwskin-phpunit-coverage-docker-publish
 - mwskin-phpunit-coverage-patch-docker
 - oojs-ui-docker-publish
 - ooui-special-node12-plus-php80-composer-docker
 - operations-mw-config-php72-composer-diffConfig-docker
 - operations-mw-config-php72-composer-lint-docker
 - operations-mw-config-php72-composer-test-docker
 - parsoidsvc-composer-package-php72-docker
 - parsoidsvc-composer-package-php73-docker
 - parsoidsvc-composer-package-php74-docker
 - parsoidsvc-composer-package-php80-docker
 - phan-php72-docker
 - phan-php73-docker
 - phan-php74-docker
 - phan-php80-docker
 - php-composer-security-docker
 - phpunit-coverage-php72-docker-publish
 - phpunit-coverage-php73-docker-publish
 - phpunit-coverage-php74-docker-publish
 - phpunit-coverage-php80-docker-publish
 - quibble-composer-mysql-php72-docker
 - quibble-composer-mysql-php72-noselenium-docker
 - quibble-composer-mysql-php72-phpunit-standalone-docker
 - quibble-composer-mysql-php72-selenium-docker
 - quibble-composer-mysql-php73-docker
 - quibble-composer-mysql-php73-noselenium-docker
 - quibble-composer-mysql-php73-phpunit-standalone-docker
 - quibble-composer-mysql-php73-selenium-docker
 - quibble-composer-mysql-php74-docker
 - quibble-composer-mysql-php74-noselenium-docker
 - quibble-composer-mysql-php74-phpunit-standalone-docker
 - quibble-composer-mysql-php74-selenium-docker
 - quibble-composer-mysql-php80-docker
 - quibble-composer-mysql-php80-noselenium-docker
 - quibble-composer-mysql-php80-phpunit-standalone-docker
 - quibble-composer-mysql-php80-selenium-docker
 - quibble-composer-postgres-php72-docker
 - quibble-composer-postgres-php72-noselenium-docker
 - quibble-composer-postgres-php72-phpunit-standalone-docker
 - quibble-composer-postgres-php72-selenium-docker
 - quibble-composer-postgres-php73-docker
 - quibble-composer-postgres-php73-noselenium-docker
 - quibble-composer-postgres-php73-phpunit-standalone-docker
 - quibble-composer-postgres-php73-selenium-docker
 - quibble-composer-postgres-php74-docker
 - quibble-composer-postgres-php74-noselenium-docker
 - quibble-composer-postgres-php74-phpunit-standalone-docker
 - quibble-composer-postgres-php74-selenium-docker
 - quibble-composer-postgres-php80-docker
 - quibble-composer-postgres-php80-noselenium-docker
 - quibble-composer-postgres-php80-phpunit-standalone-docker
 - quibble-composer-postgres-php80-selenium-docker
 - quibble-composer-sqlite-php72-docker
 - quibble-composer-sqlite-php72-noselenium-docker
 - quibble-composer-sqlite-php72-phpunit-standalone-docker
 - quibble-composer-sqlite-php72-selenium-docker
 - quibble-composer-sqlite-php73-docker
 - quibble-composer-sqlite-php73-noselenium-docker
 - quibble-composer-sqlite-php73-phpunit-standalone-docker
 - quibble-composer-sqlite-php73-selenium-docker
 - quibble-composer-sqlite-php74-docker
 - quibble-composer-sqlite-php74-noselenium-docker
 - quibble-composer-sqlite-php74-phpunit-standalone-docker
 - quibble-composer-sqlite-php74-selenium-docker
 - quibble-composer-sqlite-php80-docker
 - quibble-composer-sqlite-php80-noselenium-docker
 - quibble-composer-sqlite-php80-phpunit-standalone-docker
 - quibble-composer-sqlite-php80-selenium-docker
 - quibble-daily-Cognate-vendor-mysql-php72-docker
 - quibble-daily-InterwikiSorting-vendor-mysql-php72-docker
 - quibble-donationinterface-REL1_35-php73-docker
 - quibble-fundraising-FundraisingEmailUnsubscribe-REL1_35-php73-docker
 - quibble-fundraising-ParserFunctions-REL1_35-php73-docker
 - quibble-fundraising-cldr-REL1_35-php73-docker
 - quibble-vendor-mysql-php72-docker
 - quibble-vendor-mysql-php72-noselenium-docker
 - quibble-vendor-mysql-php72-phpunit-standalone-docker
 - quibble-vendor-mysql-php72-selenium-docker
 - quibble-vendor-mysql-php73-docker
 - quibble-vendor-mysql-php73-noselenium-docker
 - quibble-vendor-mysql-php73-phpunit-standalone-docker
 - quibble-vendor-mysql-php73-selenium-docker
 - quibble-vendor-mysql-php74-docker
 - quibble-vendor-mysql-php74-noselenium-docker
 - quibble-vendor-mysql-php74-phpunit-standalone-docker
 - quibble-vendor-mysql-php74-selenium-docker
 - quibble-vendor-mysql-php80-docker
 - quibble-vendor-mysql-php80-noselenium-docker
 - quibble-vendor-mysql-php80-phpunit-standalone-docker
 - quibble-vendor-mysql-php80-selenium-docker
 - quibble-vendor-postgres-php72-docker
 - quibble-vendor-postgres-php72-noselenium-docker
 - quibble-vendor-postgres-php72-phpunit-standalone-docker
 - quibble-vendor-postgres-php72-selenium-docker
 - quibble-vendor-postgres-php73-docker
 - quibble-vendor-postgres-php73-noselenium-docker
 - quibble-vendor-postgres-php73-phpunit-standalone-docker
 - quibble-vendor-postgres-php73-selenium-docker
 - quibble-vendor-postgres-php74-docker
 - quibble-vendor-postgres-php74-noselenium-docker
 - quibble-vendor-postgres-php74-phpunit-standalone-docker
 - quibble-vendor-postgres-php74-selenium-docker
 - quibble-vendor-postgres-php80-docker
 - quibble-vendor-postgres-php80-noselenium-docker
 - quibble-vendor-postgres-php80-phpunit-standalone-docker
 - quibble-vendor-postgres-php80-selenium-docker
 - quibble-vendor-sqlite-php72-docker
 - quibble-vendor-sqlite-php72-noselenium-docker
 - quibble-vendor-sqlite-php72-phpunit-standalone-docker
 - quibble-vendor-sqlite-php72-selenium-docker
 - quibble-vendor-sqlite-php73-docker
 - quibble-vendor-sqlite-php73-noselenium-docker
 - quibble-vendor-sqlite-php73-phpunit-standalone-docker
 - quibble-vendor-sqlite-php73-selenium-docker
 - quibble-vendor-sqlite-php74-docker
 - quibble-vendor-sqlite-php74-noselenium-docker
 - quibble-vendor-sqlite-php74-phpunit-standalone-docker
 - quibble-vendor-sqlite-php74-selenium-docker
 - quibble-vendor-sqlite-php80-docker
 - quibble-vendor-sqlite-php80-noselenium-docker
 - quibble-vendor-sqlite-php80-phpunit-standalone-docker
 - quibble-vendor-sqlite-php80-selenium-docker
 - wikibase-client-docker
 - wikibase-repo-docker
 - wikimedia-fundraising-crm-composer-php73-docker
 - wikipeg-special-node12-plus-php80-composer-docker
 - wmf-quibble-apache-selenium-php72-docker
 - wmf-quibble-apache-vendor-mysql-php72-docker
 - wmf-quibble-core-vendor-mysql-php72-docker
 - wmf-quibble-selenium-php72-docker
 - wmf-quibble-vendor-mysql-php72-docker

Bug: T279857
Change-Id: I741d236811ae69d6069b2f6d3a8b094064ab0270

jjb/integration.yaml

@@ -118,7 +118,7 @@
       - docker-src-dir
       - docker-ci-src-setup-simple
       - docker-run-with-log-cache-src:
-          image: 'docker-registry.wikimedia.org/releng/quibble-buster-php72:1.0.1'
+          image: 'docker-registry.wikimedia.org/releng/quibble-buster-php72:1.0.1-s1'
           options: >-
               -v /srv/git:/srv/git:ro
               -v "$(pwd)"/src:/src
@@ -143,7 +143,7 @@
       - docker-src-dir
       - docker-ci-src-setup-simple
       - docker-run-with-log-cache-src:
-          image: 'docker-registry.wikimedia.org/releng/quibble-buster-php72-apache:1.0.1'
+          image: 'docker-registry.wikimedia.org/releng/quibble-buster-php72-apache:1.0.1-s1'
           options: >-
               -v /srv/git:/srv/git:ro
               -v "$(pwd)"/src:/src

jjb/macro-docker.yaml

@@ -169,7 +169,7 @@
     name: docker-setup-mwext-for-phan
     builders:
      - docker-run-with-log-cache-src:
-         image: docker-registry.wikimedia.org/releng/quibble-buster-php72:1.0.1
+         image: docker-registry.wikimedia.org/releng/quibble-buster-php72:1.0.1-s1
          options: >-
              --volume "$(pwd)/src:/workspace/src"
              --volume /srv/git:/srv/git:ro
@@ -193,7 +193,7 @@
      # Install the extension/skin composer dev dependencies to bring in phan config
      - docker-run-with-log-cache-src:
         options: '--volume "$(pwd)"/src:/mediawiki'
-        image: 'docker-registry.wikimedia.org/releng/composer-php72:0.5.0-s3'
+        image: 'docker-registry.wikimedia.org/releng/composer-php72:0.5.0-s4'
         args: '--working-dir=/src/"$THING_SUBNAME" update --ansi --no-progress --prefer-dist --profile'
 
 # Use a docker image to clone the repository into /src with explicit options.

jjb/mediawiki-extensions.yaml

@@ -74,7 +74,7 @@
      - docker-setup-mwext-for-phan
      - docker-run-with-log-cache-src:
         options: '-e PHAN_COLOR_SCHEME=light --volume "$(pwd)"/src:/mediawiki'
-        image: 'docker-registry.wikimedia.org/releng/mediawiki-phan:0.9.0-s2'
+        image: 'docker-registry.wikimedia.org/releng/mediawiki-phan:0.9.0-s3'
         args: '--color'
     publishers:
      - castor-save-workspace-cache
@@ -95,7 +95,7 @@
      - docker-setup-mwext-for-phan
      - docker-run-with-log-cache-src:
         options: '-e PHAN_COLOR_SCHEME=light --volume "$(pwd)"/src:/mediawiki'
-        image: 'docker-registry.wikimedia.org/releng/mediawiki-phan-php73:0.2.0-s2'
+        image: 'docker-registry.wikimedia.org/releng/mediawiki-phan-php73:0.2.0-s3'
         args: '--color'
     publishers:
      - castor-save-workspace-cache
@@ -116,7 +116,7 @@
      - docker-setup-mwext-for-phan
      - docker-run-with-log-cache-src:
         options: '-e PHAN_COLOR_SCHEME=light --volume "$(pwd)"/src:/mediawiki'
-        image: 'docker-registry.wikimedia.org/releng/mediawiki-phan-php74:0.2.0-s2'
+        image: 'docker-registry.wikimedia.org/releng/mediawiki-phan-php74:0.2.0-s3'
         args: '--color'
     publishers:
      - castor-save-workspace-cache
@@ -137,7 +137,7 @@
      - docker-setup-mwext-for-phan
      - docker-run-with-log-cache-src:
         options: '-e PHAN_COLOR_SCHEME=light --volume "$(pwd)"/src:/mediawiki'
-        image: 'docker-registry.wikimedia.org/releng/mediawiki-phan-php80:0.1.0-s2'
+        image: 'docker-registry.wikimedia.org/releng/mediawiki-phan-php80:0.1.0-s3'
         args: '--color'
     publishers:
      - castor-save-workspace-cache

jjb/mediawiki-tools.yaml

@@ -70,7 +70,7 @@
              mediawiki/core
              mediawiki/tools/codesniffer
      - docker-run-with-log-cache-src:
-         image: 'docker-registry.wikimedia.org/releng/composer-php72:0.5.0-s3'
+         image: 'docker-registry.wikimedia.org/releng/composer-php72:0.5.0-s4'
          options: '--workdir /src/mediawiki/tools/codesniffer'
          args: 'install --ansi --no-progress --prefer-dist --profile --no-dev'
      - docker-run-with-log-cache-src:
@@ -82,7 +82,7 @@
          options: '--user=nobody --entrypoint=/bin/mv'
          args: '/src/mediawiki/tools/codesniffer /src/vendor/mediawiki/mediawiki-codesniffer'
      - docker-run-with-log-cache-src:
-         image: 'docker-registry.wikimedia.org/releng/composer-php72:0.5.0-s3'
+         image: 'docker-registry.wikimedia.org/releng/composer-php72:0.5.0-s4'
          options: '--workdir /src --entrypoint=/src/vendor/mediawiki/mediawiki-codesniffer/vendor/bin/phpcs'
          args: '-s -p'
     publishers:
@@ -107,7 +107,7 @@
              mediawiki/core
              mediawiki/tools/phan
      - docker-run-with-log-cache-src:
-         image: 'docker-registry.wikimedia.org/releng/mediawiki-phan-testrun:0.2.0-s7'
+         image: 'docker-registry.wikimedia.org/releng/mediawiki-phan-testrun:0.2.0-s8'
          options: "-e PHAN_COLOR_SCHEME=light --workdir /src"
          args: '--color'
     publishers:
@@ -125,7 +125,7 @@
      - docker-src-dir
      - docker-ci-src-setup-simple
      - docker-run-with-log-cache-src:
-         image: docker-registry.wikimedia.org/releng/mediawiki-phan-taint-check-demo:0.1.4
+         image: docker-registry.wikimedia.org/releng/mediawiki-phan-taint-check-demo:0.1.4-s1
      - doc-publish:
         docsrc: 'src/html'
         docdest: '$DOC_PROJECT/$DOC_SUBPATH/demos'

jjb/mediawiki.yaml

@@ -147,13 +147,13 @@
         - '{name}-composer-{phpflavor}-docker':
             phpflavor:
                 - php72:
-                    image: docker-registry.wikimedia.org/releng/composer-test-php72:0.4.0-s4
+                    image: docker-registry.wikimedia.org/releng/composer-test-php72:0.4.0-s5
                 - php73:
-                    image: docker-registry.wikimedia.org/releng/composer-test-php73:0.2.0-s5
+                    image: docker-registry.wikimedia.org/releng/composer-test-php73:0.2.0-s6
                 - php74:
-                    image: docker-registry.wikimedia.org/releng/composer-test-php74:0.1.0-s4
+                    image: docker-registry.wikimedia.org/releng/composer-test-php74:0.1.0-s5
                 - php80:
-                    image: docker-registry.wikimedia.org/releng/composer-test-php80:0.1.0-s6
+                    image: docker-registry.wikimedia.org/releng/composer-test-php80:0.1.0-s7
         - '{name}-node12-docker'
 
 # Phan! (T132636)
@@ -175,12 +175,12 @@
            mediawiki/core
      - docker-ci-src-setup-simple
      - docker-run-with-log-cache-src:
-        image: 'docker-registry.wikimedia.org/releng/composer-php72:0.5.0-s3'
+        image: 'docker-registry.wikimedia.org/releng/composer-php72:0.5.0-s4'
         options: '--volume "$(pwd)"/src:/mediawiki'
         args: '--working-dir=/mediawiki update --ansi --no-progress --prefer-dist --profile'
      - docker-run-with-log-cache-src:
         options: '-e PHAN_COLOR_SCHEME=light --volume "$(pwd)"/src:/mediawiki --entrypoint=/run-core.sh'
-        image: 'docker-registry.wikimedia.org/releng/mediawiki-phan:0.9.0-s2'
+        image: 'docker-registry.wikimedia.org/releng/mediawiki-phan:0.9.0-s3'
         args: '--color'
     publishers:
      - castor-save-workspace-cache
@@ -204,12 +204,12 @@
            mediawiki/core
      - docker-ci-src-setup-simple
      - docker-run-with-log-cache-src:
-        image: 'docker-registry.wikimedia.org/releng/composer-php73:0.3.0-s4'
+        image: 'docker-registry.wikimedia.org/releng/composer-php73:0.3.0-s5'
         options: '--volume "$(pwd)"/src:/mediawiki'
         args: '--working-dir=/mediawiki update --ansi --no-progress --prefer-dist --profile'
      - docker-run-with-log-cache-src:
         options: '-e PHAN_COLOR_SCHEME=light --volume "$(pwd)"/src:/mediawiki --entrypoint=/run-core.sh'
-        image: 'docker-registry.wikimedia.org/releng/mediawiki-phan-php73:0.2.0-s2'
+        image: 'docker-registry.wikimedia.org/releng/mediawiki-phan-php73:0.2.0-s3'
         args: '--color'
     publishers:
      - castor-save-workspace-cache
@@ -233,12 +233,12 @@
            mediawiki/core
      - docker-ci-src-setup-simple
      - docker-run-with-log-cache-src:
-        image: 'docker-registry.wikimedia.org/releng/composer-php74:0.2.0-s4'
+        image: 'docker-registry.wikimedia.org/releng/composer-php74:0.2.0-s5'
         options: '--volume "$(pwd)"/src:/mediawiki'
         args: '--working-dir=/mediawiki update --ansi --no-progress --prefer-dist --profile'
      - docker-run-with-log-cache-src:
         options: '-e PHAN_COLOR_SCHEME=light --volume "$(pwd)"/src:/mediawiki --entrypoint=/run-core.sh'
-        image: 'docker-registry.wikimedia.org/releng/mediawiki-phan-php74:0.2.0-s2'
+        image: 'docker-registry.wikimedia.org/releng/mediawiki-phan-php74:0.2.0-s3'
         args: '--color'
     publishers:
      - castor-save-workspace-cache
@@ -262,12 +262,12 @@
            mediawiki/core
      - docker-ci-src-setup-simple
      - docker-run-with-log-cache-src:
-        image: 'docker-registry.wikimedia.org/releng/composer-php80:0.0.2-s4'
+        image: 'docker-registry.wikimedia.org/releng/composer-php80:0.0.2-s5'
         options: '--volume "$(pwd)"/src:/mediawiki'
         args: '--working-dir=/mediawiki update --ansi --no-progress --prefer-dist --profile'
      - docker-run-with-log-cache-src:
         options: '-e PHAN_COLOR_SCHEME=light --volume "$(pwd)"/src:/mediawiki --entrypoint=/run-core.sh'
-        image: 'docker-registry.wikimedia.org/releng/mediawiki-phan-php80:0.1.0-s2'
+        image: 'docker-registry.wikimedia.org/releng/mediawiki-phan-php80:0.1.0-s3'
         args: '--color'
     publishers:
      - castor-save-workspace-cache
@@ -468,7 +468,7 @@
         - mediawiki-quibble-api-testing-vendor-{database}-{php}-docker:
             php:
                 - php72:
-                    docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php72:1.0.1
+                    docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php72:1.0.1-s1
             packages-source: vendor
             database:
                 - mysql
@@ -543,7 +543,7 @@
     builders:
         - docker-log-dir
         - docker-run-with-log:
-            image: docker-registry.wikimedia.org/releng/quibble-fresnel:1.0.1
+            image: docker-registry.wikimedia.org/releng/quibble-fresnel:1.0.1-s1
             options: '--volume /srv/git:/srv/git:ro --tmpfs /workspace/db:size=320M'
             args: '--packages-source vendor --db mysql --db-dir /workspace/db --skip-deps --commands "mediawiki-fresnel-patch"'
             logdir: '/workspace/log'
@@ -731,7 +731,7 @@
     - docker-src-dir
     - docker-castor-load
     - docker-run-with-log-and-workspace-cache:
-        image: docker-registry.wikimedia.org/releng/quibble-buster-php73-coverage:1.1.1-s1
+        image: docker-registry.wikimedia.org/releng/quibble-buster-php73-coverage:1.1.1-s2
         options: '-e CODEHEALTH=1 --volume "$(pwd)"/src:/workspace/src --volume "$(pwd)"/cover:/workspace/cover --volume /srv/git:/srv/git:ro --tmpfs /workspace/db:size=320M'
         args: '--packages-source "{packages-source}" --git-parallel=8 {quibble_args}'
         logdir: '/workspace/log'
@@ -820,7 +820,7 @@
     - docker-wipe-dir:
         dir: 'cover'
     - docker-run-with-log-and-workspace-cache:
-        image: docker-registry.wikimedia.org/releng/quibble-buster-php73-coverage:1.1.1-s1
+        image: docker-registry.wikimedia.org/releng/quibble-buster-php73-coverage:1.1.1-s2
         options: '-e CODEHEALTH=1 --volume "$(pwd)"/src:/workspace/src --volume "$(pwd)"/cover:/workspace/cover --volume /srv/git:/srv/git:ro'
         args: '--packages-source "{packages-source}" --git-parallel=8 --skip-install --commands=mwext-phpunit-coverage'
         logdir: '/workspace/log'
@@ -951,13 +951,13 @@
         - sqlite
     php:
         - php72:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php72:1.0.1
+            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php72:1.0.1-s1
         - php73:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php73:1.0.1-s1
+            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php73:1.0.1-s2
         - php74:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php74:1.0.1-s1
+            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php74:1.0.1-s2
         - php80:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php80:1.0.1-s1
+            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php80:1.0.1-s2
     jobs:
         - quibble-{packages-source}-{database}-{php}-docker
         - quibble-{packages-source}-{database}-{php}-noselenium-docker
@@ -969,32 +969,32 @@
         - mediawiki-quibble-apitests-{packages-source}-{php}-docker:
             database: 'mysql'
         - mwcore-phpunit-coverage-patch:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php73-coverage:1.1.1-s1
+            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php73-coverage:1.1.1-s2
             packages-source: vendor
             database: sqlite
         - mwcore-phpunit-coverage-master:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php73-coverage:1.1.1-s1
+            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php73-coverage:1.1.1-s2
             packages-source: vendor
             database: sqlite
         - mwext-phpunit-coverage-patch-docker:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php73-coverage:1.1.1-s1
+            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php73-coverage:1.1.1-s2
             packages-source:  composer
             database: mysql
         - mwext-phpunit-coverage-docker-publish:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php73-coverage:1.1.1-s1
+            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php73-coverage:1.1.1-s2
             packages-source:  composer
             database: mysql
         - mwskin-phpunit-coverage-patch-docker:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php73-coverage:1.1.1-s1
+            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php73-coverage:1.1.1-s2
             packages-source:  composer
             database: mysql
         - mwskin-phpunit-coverage-docker-publish:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php73-coverage:1.1.1-s1
+            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php73-coverage:1.1.1-s2
             packages-source:  composer
             database: mysql
         # Explicitly flag this ruby selenium job as a legacy one that should not be used
         - legacy-quibble-rubyselenium-docker:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php72-bundle:1.0.1
+            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php72-bundle:1.0.1-s1
             packages-source: vendor
             database: mysql
 
@@ -1009,19 +1009,19 @@
     # And only php7.2
     php:
         - php72:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php72:1.0.1
+            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php72:1.0.1-s1
     jobs:
         - wmf-quibble-vendor-mysql-{php}-docker
         - wmf-quibble-core-vendor-mysql-{php}-docker
         - wmf-quibble-selenium-{php}-docker
         - wmf-quibble-apache-vendor-mysql-{php}-docker:
             php:
                 - php72:
-                    docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php72-apache:1.0.1
+                    docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php72-apache:1.0.1-s1
         - wmf-quibble-apache-selenium-{php}-docker:
             php:
                 - php72:
-                    docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php72-apache:1.0.1
+                    docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php72-apache:1.0.1-s1
 
 # General MW-Selenium job used to dogfood the builder against MW core.
 - job-template:
@@ -1034,7 +1034,7 @@
     name: mediawiki-selenium-integration
     jobs:
         - mediawiki-selenium-integration-docker:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php72-bundle:1.0.1
+            docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php72-bundle:1.0.1-s1
 
             packages-source: vendor
             database: mysql
@@ -1053,7 +1053,7 @@
 
 - project:
     name: wikibase
-    docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php73:1.0.1-s1
+    docker_image: docker-registry.wikimedia.org/releng/quibble-buster-php73:1.0.1-s2
     packages-source: composer
     kind:
         - client:

jjb/misc.yaml

@@ -57,13 +57,13 @@
     name: phpunit-coverage-publish
     php:
         - php72:
-            docker_image: docker-registry.wikimedia.org/releng/composer-php72:0.5.0-s3
+            docker_image: docker-registry.wikimedia.org/releng/composer-php72:0.5.0-s4
         - php73:
-            docker_image: docker-registry.wikimedia.org/releng/composer-php73:0.3.0-s4
+            docker_image: docker-registry.wikimedia.org/releng/composer-php73:0.3.0-s5
         - php74:
-            docker_image: docker-registry.wikimedia.org/releng/composer-php74:0.2.0-s4
+            docker_image: docker-registry.wikimedia.org/releng/composer-php74:0.2.0-s5
         - php80:
-            docker_image: docker-registry.wikimedia.org/releng/composer-php80:0.0.2-s4
+            docker_image: docker-registry.wikimedia.org/releng/composer-php80:0.0.2-s5
     jobs:
         - phpunit-coverage-{php}-docker-publish
 

jjb/oojs.yaml

@@ -9,7 +9,7 @@
      - docker-src-dir
      - docker-ci-src-setup-simple
      - docker-run-with-log-cache-src:
-         image: docker-registry.wikimedia.org/releng/node12-test-browser-php80-composer:0.2.0-s1
+         image: docker-registry.wikimedia.org/releng/node12-test-browser-php80-composer:0.2.0-s2
          # 'npm run jenkins' also runs composer
          options: '--entrypoint /run-with-xvfb.sh'
          args: 'jenkins'
@@ -29,7 +29,7 @@
      - docker-log-dir
      - docker-ci-src-setup-simple
      - docker-run-with-log-cache-src:
-         image: docker-registry.wikimedia.org/releng/node12-test-browser-php80-composer:0.2.0-s1
+         image: docker-registry.wikimedia.org/releng/node12-test-browser-php80-composer:0.2.0-s2
          # npm run-script jenkins runs 'npm test' and 'npm run doc'
          options: '--entrypoint /run-with-xvfb.sh'
          args: 'jenkins'

jjb/operations-misc.yaml

@@ -79,7 +79,7 @@
     name: 'operations-mw-config'
     phpflavor:
      - php72:
-         image: docker-registry.wikimedia.org/releng/composer-php72:0.5.0-s3
+         image: docker-registry.wikimedia.org/releng/composer-php72:0.5.0-s4
     jobs:
      - '{name}-typos-docker'
      - 'operations-mw-config-{phpflavor}-composer-{run-script}-docker':

jjb/parsoidsvc.yaml

@@ -45,18 +45,18 @@
         - wikipeg-special-node12-plus-{php}-composer-docker:
             php:
                 - php80:
-                    docker_image: docker-registry.wikimedia.org/releng/node12-test-browser-php80-composer:0.2.0-s1
+                    docker_image: docker-registry.wikimedia.org/releng/node12-test-browser-php80-composer:0.2.0-s2
 
 - project:
     name: parsoidsvc
     jobs:
         - '{name}-composer-package-{phpflavor}-docker':
             phpflavor:
                 - php72:
-                    image: docker-registry.wikimedia.org/releng/composer-package-php72:0.4.0-s5
+                    image: docker-registry.wikimedia.org/releng/composer-package-php72:0.4.0-s6
                 - php73:
-                    image: docker-registry.wikimedia.org/releng/composer-package-php73:0.3.0-s5
+                    image: docker-registry.wikimedia.org/releng/composer-package-php73:0.3.0-s6
                 - php74:
-                    image: docker-registry.wikimedia.org/releng/composer-package-php74:0.3.0-s5
+                    image: docker-registry.wikimedia.org/releng/composer-package-php74:0.3.0-s6
                 - php80:
-                    image: docker-registry.wikimedia.org/releng/composer-package-php80:0.0.4-s5
+                    image: docker-registry.wikimedia.org/releng/composer-package-php80:0.0.4-s6