diff --git a/lib/manager/circleci/extract.js b/lib/manager/circleci/extract.js index 9eef2a7613a6857d4c922774e88366f5253e471f..bbf5a6ba522803eecacc7f87ca003da77e50abd9 100644 --- a/lib/manager/circleci/extract.js +++ b/lib/manager/circleci/extract.js @@ -34,7 +34,7 @@ function extractDependencies(content) { currentDigest, depName, currentTag, - versionScheme: 'semver', + versionScheme: 'docker', }; if (depName === 'node' || depName.endsWith('/node')) { dep.commitMessageTopic = 'Node.js'; diff --git a/lib/manager/docker-compose/extract.js b/lib/manager/docker-compose/extract.js index f892923f2f586966a0a0424f277036c1760a94bd..194a8adcf8478eba97d213a0770edfa3d5b019fd 100644 --- a/lib/manager/docker-compose/extract.js +++ b/lib/manager/docker-compose/extract.js @@ -33,7 +33,7 @@ function extractDependencies(content) { currentDigest, depName, currentTag, - versionScheme: 'semver', + versionScheme: 'docker', }; if (depName === 'node' || depName.endsWith('/node')) { dep.commitMessageTopic = 'Node.js'; diff --git a/lib/manager/docker/extract.js b/lib/manager/docker/extract.js index d15e1e720e674a707359156e56dc6f2e7d857b7e..e36073f3bcade4d5393bcca9dc92889bfba3cd8c 100644 --- a/lib/manager/docker/extract.js +++ b/lib/manager/docker/extract.js @@ -82,7 +82,7 @@ function extractDependencies(content) { currentDigest, depName, currentTag, - versionScheme: 'semver', + versionScheme: 'docker', }; if (depName === 'node' || depName.endsWith('/node')) { dep.commitMessageTopic = 'Node.js'; diff --git a/lib/versioning/docker/index.js b/lib/versioning/docker/index.js new file mode 100644 index 0000000000000000000000000000000000000000..9017641c6841f007ccdf7794c53c685ec9ee26ea --- /dev/null +++ b/lib/versioning/docker/index.js @@ -0,0 +1,5 @@ +const semver = require('../semver'); + +module.exports = { + ...semver, +}; diff --git a/lib/versioning/index.js b/lib/versioning/index.js index 7cad3bb8c04dcb5260c1cd4a210c20b17a3a0dd5..cab16eeefa3a4dd361fb1b0067e657cb7fbd0e1a 100644 --- a/lib/versioning/index.js +++ b/lib/versioning/index.js @@ -1,8 +1,10 @@ +const docker = require('./docker'); const semver = require('./semver'); const semverComposer = require('./semver-composer'); const pep440 = require('./pep440'); const schemes = { + docker, semver, semverComposer, pep440, diff --git a/test/manager/circleci/__snapshots__/extract.spec.js.snap b/test/manager/circleci/__snapshots__/extract.spec.js.snap index df914446e3fc713bcfd019a6ef60ca191c7a317e..da58667e257b38bb5f64a0841ae3b41f3ca51b57 100644 --- a/test/manager/circleci/__snapshots__/extract.spec.js.snap +++ b/test/manager/circleci/__snapshots__/extract.spec.js.snap @@ -13,7 +13,7 @@ Array [ "dockerRegistry": undefined, "fromVersion": "node", "lineNumber": 12, - "versionScheme": "semver", + "versionScheme": "docker", }, Object { "commitMessageTopic": "Node.js", @@ -26,7 +26,7 @@ Array [ "dockerRegistry": undefined, "fromVersion": "node:4", "lineNumber": 57, - "versionScheme": "semver", + "versionScheme": "docker", }, Object { "commitMessageTopic": "Node.js", @@ -39,7 +39,7 @@ Array [ "dockerRegistry": undefined, "fromVersion": "node:6", "lineNumber": 61, - "versionScheme": "semver", + "versionScheme": "docker", }, Object { "commitMessageTopic": "Node.js", @@ -52,7 +52,7 @@ Array [ "dockerRegistry": undefined, "fromVersion": "node:8.9.0", "lineNumber": 65, - "versionScheme": "semver", + "versionScheme": "docker", }, ] `; diff --git a/test/manager/docker-compose/__snapshots__/extract.spec.js.snap b/test/manager/docker-compose/__snapshots__/extract.spec.js.snap index 2a1c4ab1d37fe09cee639ba38b90bca4ca034900..2edb4b6264e9525ed554c837f25f5cd54dcdc2eb 100644 --- a/test/manager/docker-compose/__snapshots__/extract.spec.js.snap +++ b/test/manager/docker-compose/__snapshots__/extract.spec.js.snap @@ -11,7 +11,7 @@ Array [ "depName": "something/redis", "dockerRegistry": "quay.io", "lineNumber": 4, - "versionScheme": "semver", + "versionScheme": "docker", }, Object { "commitMessageTopic": "Node.js", @@ -23,7 +23,7 @@ Array [ "depName": "node", "dockerRegistry": undefined, "lineNumber": 18, - "versionScheme": "semver", + "versionScheme": "docker", }, Object { "currentDepTag": "postgres:9.4.0", @@ -34,7 +34,7 @@ Array [ "depName": "postgres", "dockerRegistry": undefined, "lineNumber": 21, - "versionScheme": "semver", + "versionScheme": "docker", }, Object { "currentDepTag": "dockersamples/examplevotingapp_vote:before", @@ -45,7 +45,7 @@ Array [ "depName": "dockersamples/examplevotingapp_vote", "dockerRegistry": undefined, "lineNumber": 31, - "versionScheme": "semver", + "versionScheme": "docker", }, Object { "currentDepTag": "dockersamples/examplevotingapp_result:before", @@ -56,7 +56,7 @@ Array [ "depName": "dockersamples/examplevotingapp_result", "dockerRegistry": undefined, "lineNumber": 46, - "versionScheme": "semver", + "versionScheme": "docker", }, Object { "currentDepTag": "dockersamples/examplevotingapp_worker", @@ -67,7 +67,7 @@ Array [ "depName": "dockersamples/examplevotingapp_worker", "dockerRegistry": undefined, "lineNumber": 62, - "versionScheme": "semver", + "versionScheme": "docker", }, Object { "currentDepTag": "dockersamples/visualizer:stable", @@ -78,7 +78,7 @@ Array [ "depName": "dockersamples/visualizer", "dockerRegistry": undefined, "lineNumber": 79, - "versionScheme": "semver", + "versionScheme": "docker", }, ] `; diff --git a/test/manager/docker/__snapshots__/extract.spec.js.snap b/test/manager/docker/__snapshots__/extract.spec.js.snap index da77b141ec88a43b690a63d53ae62fd26a98d2cc..4f8c8c799e675639ecd64d1a6c373fb537bf3d63 100644 --- a/test/manager/docker/__snapshots__/extract.spec.js.snap +++ b/test/manager/docker/__snapshots__/extract.spec.js.snap @@ -15,7 +15,7 @@ Array [ "fromPrefix": "FROM", "fromSuffix": "AS node", "language": "docker", - "versionScheme": "semver", + "versionScheme": "docker", }, Object { "currentDepTag": "buildkite/puppeteer:1.1.1", @@ -29,7 +29,7 @@ Array [ "fromPrefix": "FROM", "fromSuffix": "AS puppeteer", "language": "docker", - "versionScheme": "semver", + "versionScheme": "docker", }, ] `; @@ -49,7 +49,7 @@ Array [ "fromPrefix": "FROM", "fromSuffix": "as frontend", "language": "docker", - "versionScheme": "semver", + "versionScheme": "docker", }, Object { "currentDepTag": "python:3.6-slim", @@ -63,7 +63,7 @@ Array [ "fromPrefix": "FROM", "fromSuffix": "", "language": "docker", - "versionScheme": "semver", + "versionScheme": "docker", }, ] `; @@ -83,7 +83,7 @@ Array [ "fromPrefix": "FROM", "fromSuffix": "", "language": "docker", - "versionScheme": "semver", + "versionScheme": "docker", }, ] `; @@ -103,7 +103,7 @@ Array [ "fromPrefix": "FROM", "fromSuffix": "", "language": "docker", - "versionScheme": "semver", + "versionScheme": "docker", }, ] `; @@ -123,7 +123,7 @@ Array [ "fromPrefix": "FROM", "fromSuffix": "", "language": "docker", - "versionScheme": "semver", + "versionScheme": "docker", }, ] `; @@ -143,7 +143,7 @@ Array [ "fromPrefix": "FROM", "fromSuffix": "", "language": "docker", - "versionScheme": "semver", + "versionScheme": "docker", }, ] `; @@ -163,7 +163,7 @@ Array [ "fromPrefix": "FROM", "fromSuffix": "", "language": "docker", - "versionScheme": "semver", + "versionScheme": "docker", }, ] `; @@ -183,7 +183,7 @@ Array [ "fromPrefix": "FROM", "fromSuffix": "", "language": "docker", - "versionScheme": "semver", + "versionScheme": "docker", }, ] `; @@ -203,7 +203,7 @@ Array [ "fromPrefix": "FROM", "fromSuffix": "as base", "language": "docker", - "versionScheme": "semver", + "versionScheme": "docker", }, ] `; @@ -223,7 +223,7 @@ Array [ "fromPrefix": "FROM", "fromSuffix": "", "language": "docker", - "versionScheme": "semver", + "versionScheme": "docker", }, ] `; @@ -243,7 +243,7 @@ Array [ "fromPrefix": "FROM", "fromSuffix": "", "language": "docker", - "versionScheme": "semver", + "versionScheme": "docker", }, ] `; @@ -263,7 +263,7 @@ Array [ "fromPrefix": "FROM", "fromSuffix": "", "language": "docker", - "versionScheme": "semver", + "versionScheme": "docker", }, ] `; @@ -283,7 +283,7 @@ Array [ "fromPrefix": "FROM", "fromSuffix": "", "language": "docker", - "versionScheme": "semver", + "versionScheme": "docker", }, ] `; @@ -303,7 +303,7 @@ Array [ "fromPrefix": "From", "fromSuffix": "", "language": "docker", - "versionScheme": "semver", + "versionScheme": "docker", }, ] `; @@ -323,7 +323,7 @@ Array [ "fromPrefix": "FROM", "fromSuffix": "as frontend", "language": "docker", - "versionScheme": "semver", + "versionScheme": "docker", }, ] `;