From b3e6c9b82b2d1e4ed8be0f4f898fb0323c415868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dalibor=20Karlovi=C4=87?= Date: Fri, 21 Apr 2023 10:27:49 +0200 Subject: [PATCH] bump: all images used (#130) --- resources/Lighthouse/common.mk | 2 +- resources/PHP/common.mk | 2 +- resources/Visual/common.mk | 2 +- resources/YASSG/compat.mk | 2 +- tests/functional/PHP/PhpTrait.php | 2 +- tests/functional/YASSG/CompatTest.php | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/Lighthouse/common.mk b/resources/Lighthouse/common.mk index f718a11..98fa346 100644 --- a/resources/Lighthouse/common.mk +++ b/resources/Lighthouse/common.mk @@ -1,4 +1,4 @@ -LIGHTHOUSE_DOCKER_IMAGE ?= cypress/browsers:node18.12.0-chrome107 +LIGHTHOUSE_DOCKER_IMAGE ?= cypress/browsers:node-18.16.0-chrome-112.0.5615.121-1-ff-112.0.1-edge-112.0.1722.48-1 LIGHTHOUSE_DOCKER_COMMAND ?= docker run --init --interactive ${DOCKER_TTY} --rm --env HOME=/tmp ${DOCKER_USER} --volume "${DOCKER_CWD}:/public" --workdir "/public" ${LIGHTHOUSE_DOCKER_IMAGE} analyze/lighthouse: ## Analyze built files using Lighthouse diff --git a/resources/PHP/common.mk b/resources/PHP/common.mk index 432a5de..aff5a0e 100644 --- a/resources/PHP/common.mk +++ b/resources/PHP/common.mk @@ -8,7 +8,7 @@ PHP_VERSION=8.2 endif ifndef PHPQA_DOCKER_IMAGE -PHPQA_DOCKER_IMAGE=jakzal/phpqa:1.86.1-php${PHP_VERSION}-alpine +PHPQA_DOCKER_IMAGE=jakzal/phpqa:1.87.0-php${PHP_VERSION}-alpine endif ifndef PHPQA_DOCKER_COMMAND diff --git a/resources/Visual/common.mk b/resources/Visual/common.mk index d10bd52..25e767f 100644 --- a/resources/Visual/common.mk +++ b/resources/Visual/common.mk @@ -3,7 +3,7 @@ $(error BASE_URL must be defined before loading Visual/common.mk) endif PROJECT_ROOT = ${DOCKER_CWD} -BACKSTOP_DOCKER_IMAGE ?= backstopjs/backstopjs:6.1.4 +BACKSTOP_DOCKER_IMAGE ?= backstopjs/backstopjs:6.2.1 BACKSTOP_DOCKER_COMMAND ?= docker run --init --interactive ${TTY} --shm-size 256MB --cap-add=SYS_ADMIN --rm --env PROJECT_ROOT=${PROJECT_ROOT} --env BASE_URL=${BASE_URL} ${DOCKER_USER} --tmpfs /tmp --volume "${PROJECT_ROOT}:${PROJECT_ROOT}" --workdir "${PROJECT_ROOT}" ${BACKSTOP_DOCKER_IMAGE} --config backstop.config.js visual/test: ${BACKSTOP_DOCKER_COMMAND} test diff --git a/resources/YASSG/compat.mk b/resources/YASSG/compat.mk index 1bc614b..aca6acf 100644 --- a/resources/YASSG/compat.mk +++ b/resources/YASSG/compat.mk @@ -7,7 +7,7 @@ include ${SIGWIN_INFRA_ROOT:%/=%}/Lighthouse/common.mk include ${SIGWIN_INFRA_ROOT:%/=%}/PHP/common.mk ifndef LYCHEE_DOCKER_IMAGE -LYCHEE_DOCKER_IMAGE=lycheeverse/lychee:20220118134522908286 +LYCHEE_DOCKER_IMAGE=lycheeverse/lychee:0.12.0 endif ifndef LYCHEE_DOCKER_COMMAND diff --git a/tests/functional/PHP/PhpTrait.php b/tests/functional/PHP/PhpTrait.php index b2cc0af..c5cf113 100644 --- a/tests/functional/PHP/PhpTrait.php +++ b/tests/functional/PHP/PhpTrait.php @@ -34,7 +34,7 @@ private function paths(?array $env): array { // defaults which are also defined in the Makefile $phpVersion = $env['PHP_VERSION'] ?? '8.2'; - $phpqaDockerImage = $env['PHPQA_DOCKER_IMAGE'] ?? 'jakzal/phpqa:1.86.1-php%1$s-alpine'; + $phpqaDockerImage = $env['PHPQA_DOCKER_IMAGE'] ?? 'jakzal/phpqa:1.87.0-php%1$s-alpine'; return [ 'analyze' => [ diff --git a/tests/functional/YASSG/CompatTest.php b/tests/functional/YASSG/CompatTest.php index 45d282e..5ed9401 100644 --- a/tests/functional/YASSG/CompatTest.php +++ b/tests/functional/YASSG/CompatTest.php @@ -111,7 +111,7 @@ public function testDevServerWorks(): void private function generateDockerBackstopExecutionPath(string $command): string { return sprintf( - 'docker run --init --interactive --shm-size 256MB --cap-add=SYS_ADMIN --rm --env PROJECT_ROOT=$ROOT --env BASE_URL=file://localhost$ROOT/public %2$s --tmpfs /tmp --volume "$ROOT:$ROOT" --workdir "$ROOT" backstopjs/backstopjs:6.1.4 --config backstop.config.js %1$s', + 'docker run --init --interactive --shm-size 256MB --cap-add=SYS_ADMIN --rm --env PROJECT_ROOT=$ROOT --env BASE_URL=file://localhost$ROOT/public %2$s --tmpfs /tmp --volume "$ROOT:$ROOT" --workdir "$ROOT" backstopjs/backstopjs:6.2.1 --config backstop.config.js %1$s', $command, $this->generateDockerComposeExecutionUser() ); @@ -120,7 +120,7 @@ private function generateDockerBackstopExecutionPath(string $command): string private function generateDockerLighthouseExecutionPath(string $command): string { return sprintf( - 'docker run --init --interactive --rm --env HOME=/tmp %2$s --volume "$ROOT:/public" --workdir "/public" cypress/browsers:node18.12.0-chrome107 %1$s', + 'docker run --init --interactive --rm --env HOME=/tmp %2$s --volume "$ROOT:/public" --workdir "/public" cypress/browsers:node-18.16.0-chrome-112.0.5615.121-1-ff-112.0.1-edge-112.0.1722.48-1 %1$s', $command, $this->generateDockerComposeExecutionUser() );