From 4e6767796b76da22370228b332f4c23e4f750052 Mon Sep 17 00:00:00 2001 From: jNullj <15849761+jNullj@users.noreply.github.com> Date: Fri, 22 Nov 2024 13:58:31 +0200 Subject: [PATCH 1/3] Update docker version tester to check Python instead of Memcached Memcached tags don't follow semver, might fail depending on which tag was last added. Python seems to follow semver for all tags. fixes #10689 --- services/docker/docker-version.tester.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/services/docker/docker-version.tester.js b/services/docker/docker-version.tester.js index 154db922f0f08..4771542362b19 100644 --- a/services/docker/docker-version.tester.js +++ b/services/docker/docker-version.tester.js @@ -2,12 +2,10 @@ import { isSemver } from '../test-validators.js' import { createServiceTester } from '../tester.js' export const t = await createServiceTester() -t.create('docker version (valid, library)') - .get('/_/memcached.json') - .expectBadge({ - label: 'version', - message: isSemver, - }) +t.create('docker version (valid, library)').get('/_/python.json').expectBadge({ + label: 'version', + message: isSemver, +}) t.create('docker version (valid, library with tag)') .get('/_/alpine/latest.json') From eaee134f9ae899c152c4dbca874e95a0b2a34ac7 Mon Sep 17 00:00:00 2001 From: jNullj <15849761+jNullj@users.noreply.github.com> Date: Fri, 22 Nov 2024 14:21:08 +0200 Subject: [PATCH 2/3] Update docker version tester to check docker-dev instead of python its a depricated image and is not expected to change tags tag is semver --- services/docker/docker-version.tester.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/services/docker/docker-version.tester.js b/services/docker/docker-version.tester.js index 4771542362b19..c0fea6dcedd8b 100644 --- a/services/docker/docker-version.tester.js +++ b/services/docker/docker-version.tester.js @@ -2,10 +2,12 @@ import { isSemver } from '../test-validators.js' import { createServiceTester } from '../tester.js' export const t = await createServiceTester() -t.create('docker version (valid, library)').get('/_/python.json').expectBadge({ - label: 'version', - message: isSemver, -}) +t.create('docker version (valid, library)') + .get('/_/docker-dev.json') + .expectBadge({ + label: 'version', + message: isSemver, + }) t.create('docker version (valid, library with tag)') .get('/_/alpine/latest.json') From 21f45ce3e9a8cacc1f65d37cd0473b880b4c319c Mon Sep 17 00:00:00 2001 From: jNullj <15849761+jNullj@users.noreply.github.com> Date: Fri, 22 Nov 2024 14:32:10 +0200 Subject: [PATCH 3/3] Update docker version tester to check example-voting-app-vote deprecated yet by docker, i think we can count on that to be stable --- services/docker/docker-version.tester.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/docker/docker-version.tester.js b/services/docker/docker-version.tester.js index c0fea6dcedd8b..8410a69ffb060 100644 --- a/services/docker/docker-version.tester.js +++ b/services/docker/docker-version.tester.js @@ -3,10 +3,10 @@ import { createServiceTester } from '../tester.js' export const t = await createServiceTester() t.create('docker version (valid, library)') - .get('/_/docker-dev.json') + .get('/docker/example-voting-app-vote.json') .expectBadge({ label: 'version', - message: isSemver, + message: 'latest', }) t.create('docker version (valid, library with tag)')