Skip to content

Commit

Permalink
bump: all images used (#130)
Browse files Browse the repository at this point in the history
  • Loading branch information
dkarlovi authored Apr 21, 2023
1 parent fff4a66 commit b3e6c9b
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion resources/Lighthouse/common.mk
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion resources/PHP/common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion resources/Visual/common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion resources/YASSG/compat.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/PHP/PhpTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -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' => [
Expand Down
4 changes: 2 additions & 2 deletions tests/functional/YASSG/CompatTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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()
);
Expand All @@ -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()
);
Expand Down

0 comments on commit b3e6c9b

Please sign in to comment.