mirror of
https://github.com/hoverkraft-tech/compose-action.git
synced 2026-03-06 08:13:10 +08:00
chore(deps): bump docker-compose from 1.3.0 to 1.3.1
Some checks failed
Internal - Main - Continuous Integration / ci (push) Has been cancelled
Need fix to Issue / main (push) Has been cancelled
Prepare release / release (push) Has been cancelled
Internal - Main - Continuous Integration / prepare-docs (push) Has been cancelled
Internal - Main - Continuous Integration / sync-docs (push) Has been cancelled
Mark stale issues and pull requests / main (push) Has been cancelled
Some checks failed
Internal - Main - Continuous Integration / ci (push) Has been cancelled
Need fix to Issue / main (push) Has been cancelled
Prepare release / release (push) Has been cancelled
Internal - Main - Continuous Integration / prepare-docs (push) Has been cancelled
Internal - Main - Continuous Integration / sync-docs (push) Has been cancelled
Mark stale issues and pull requests / main (push) Has been cancelled
Bumps [docker-compose](https://github.com/PDMLab/docker-compose) from 1.3.0 to 1.3.1. - [Changelog](https://github.com/PDMLab/docker-compose/blob/master/CHANGELOG.md) - [Commits](https://github.com/PDMLab/docker-compose/compare/v1.3.0...v1.3.1) --- updated-dependencies: - dependency-name: docker-compose dependency-version: 1.3.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Emilien Escalle <emilien.escalle@escemi.com>
This commit is contained in:
parent
2ab47e7e09
commit
bb5664383c
12
dist/index.js
generated
vendored
12
dist/index.js
generated
vendored
@ -931,6 +931,7 @@ const mapImListOutput = (output, options) => {
|
|||||||
container: serviceLine.ContainerName,
|
container: serviceLine.ContainerName,
|
||||||
repository: serviceLine.Repository,
|
repository: serviceLine.Repository,
|
||||||
tag: serviceLine.Tag,
|
tag: serviceLine.Tag,
|
||||||
|
platform: serviceLine.Platform || '',
|
||||||
id: idFragment
|
id: idFragment
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
@ -943,6 +944,7 @@ const mapImListOutput = (output, options) => {
|
|||||||
.map((line) => {
|
.map((line) => {
|
||||||
// the line has the columns in the following order:
|
// the line has the columns in the following order:
|
||||||
// CONTAINER REPOSITORY TAG IMAGE ID SIZE
|
// CONTAINER REPOSITORY TAG IMAGE ID SIZE
|
||||||
|
// Note: newer docker compose versions may include PLATFORM column
|
||||||
const lineColumns = line.split(/\s{3,}/);
|
const lineColumns = line.split(/\s{3,}/);
|
||||||
const containerFragment = lineColumns[0] || line;
|
const containerFragment = lineColumns[0] || line;
|
||||||
const repositoryFragment = lineColumns[1] || '';
|
const repositoryFragment = lineColumns[1] || '';
|
||||||
@ -952,6 +954,7 @@ const mapImListOutput = (output, options) => {
|
|||||||
container: containerFragment.trim(),
|
container: containerFragment.trim(),
|
||||||
repository: repositoryFragment.trim(),
|
repository: repositoryFragment.trim(),
|
||||||
tag: tagFragment.trim(),
|
tag: tagFragment.trim(),
|
||||||
|
platform: '',
|
||||||
id: idFragment.trim()
|
id: idFragment.trim()
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
@ -1238,8 +1241,13 @@ const ps = async function (options) {
|
|||||||
exports.ps = ps;
|
exports.ps = ps;
|
||||||
const images = async function (options) {
|
const images = async function (options) {
|
||||||
try {
|
try {
|
||||||
const result = await (0, exports.execCompose)('images', [], options);
|
// Always use JSON format for robust parsing across docker compose versions
|
||||||
const data = (0, exports.mapImListOutput)(result.out, options);
|
const jsonOptions = {
|
||||||
|
...options,
|
||||||
|
commandOptions: [...(options?.commandOptions || []), ['--format', 'json']]
|
||||||
|
};
|
||||||
|
const result = await (0, exports.execCompose)('images', [], jsonOptions);
|
||||||
|
const data = (0, exports.mapImListOutput)(result.out, jsonOptions);
|
||||||
return {
|
return {
|
||||||
...result,
|
...result,
|
||||||
data
|
data
|
||||||
|
|||||||
12
dist/post.js
generated
vendored
12
dist/post.js
generated
vendored
@ -88,6 +88,7 @@ const mapImListOutput = (output, options) => {
|
|||||||
container: serviceLine.ContainerName,
|
container: serviceLine.ContainerName,
|
||||||
repository: serviceLine.Repository,
|
repository: serviceLine.Repository,
|
||||||
tag: serviceLine.Tag,
|
tag: serviceLine.Tag,
|
||||||
|
platform: serviceLine.Platform || '',
|
||||||
id: idFragment
|
id: idFragment
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
@ -100,6 +101,7 @@ const mapImListOutput = (output, options) => {
|
|||||||
.map((line) => {
|
.map((line) => {
|
||||||
// the line has the columns in the following order:
|
// the line has the columns in the following order:
|
||||||
// CONTAINER REPOSITORY TAG IMAGE ID SIZE
|
// CONTAINER REPOSITORY TAG IMAGE ID SIZE
|
||||||
|
// Note: newer docker compose versions may include PLATFORM column
|
||||||
const lineColumns = line.split(/\s{3,}/);
|
const lineColumns = line.split(/\s{3,}/);
|
||||||
const containerFragment = lineColumns[0] || line;
|
const containerFragment = lineColumns[0] || line;
|
||||||
const repositoryFragment = lineColumns[1] || '';
|
const repositoryFragment = lineColumns[1] || '';
|
||||||
@ -109,6 +111,7 @@ const mapImListOutput = (output, options) => {
|
|||||||
container: containerFragment.trim(),
|
container: containerFragment.trim(),
|
||||||
repository: repositoryFragment.trim(),
|
repository: repositoryFragment.trim(),
|
||||||
tag: tagFragment.trim(),
|
tag: tagFragment.trim(),
|
||||||
|
platform: '',
|
||||||
id: idFragment.trim()
|
id: idFragment.trim()
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
@ -395,8 +398,13 @@ const ps = async function (options) {
|
|||||||
exports.ps = ps;
|
exports.ps = ps;
|
||||||
const images = async function (options) {
|
const images = async function (options) {
|
||||||
try {
|
try {
|
||||||
const result = await (0, exports.execCompose)('images', [], options);
|
// Always use JSON format for robust parsing across docker compose versions
|
||||||
const data = (0, exports.mapImListOutput)(result.out, options);
|
const jsonOptions = {
|
||||||
|
...options,
|
||||||
|
commandOptions: [...(options?.commandOptions || []), ['--format', 'json']]
|
||||||
|
};
|
||||||
|
const result = await (0, exports.execCompose)('images', [], jsonOptions);
|
||||||
|
const data = (0, exports.mapImListOutput)(result.out, jsonOptions);
|
||||||
return {
|
return {
|
||||||
...result,
|
...result,
|
||||||
data
|
data
|
||||||
|
|||||||
8
package-lock.json
generated
8
package-lock.json
generated
@ -13,7 +13,7 @@
|
|||||||
"@actions/github": "^9.0.0",
|
"@actions/github": "^9.0.0",
|
||||||
"@actions/tool-cache": "^4.0.0",
|
"@actions/tool-cache": "^4.0.0",
|
||||||
"@octokit/action": "^8.0.4",
|
"@octokit/action": "^8.0.4",
|
||||||
"docker-compose": "^1.3.0"
|
"docker-compose": "^1.3.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@ts-dev-tools/core": "^1.9.14",
|
"@ts-dev-tools/core": "^1.9.14",
|
||||||
@ -5731,9 +5731,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/docker-compose": {
|
"node_modules/docker-compose": {
|
||||||
"version": "1.3.0",
|
"version": "1.3.1",
|
||||||
"resolved": "https://registry.npmjs.org/docker-compose/-/docker-compose-1.3.0.tgz",
|
"resolved": "https://registry.npmjs.org/docker-compose/-/docker-compose-1.3.1.tgz",
|
||||||
"integrity": "sha512-7Gevk/5eGD50+eMD+XDnFnOrruFkL0kSd7jEG4cjmqweDSUhB7i0g8is/nBdVpl+Bx338SqIB2GLKm32M+Vs6g==",
|
"integrity": "sha512-rF0wH69G3CCcmkN9J1RVMQBaKe8o77LT/3XmqcLIltWWVxcWAzp2TnO7wS3n/umZHN3/EVrlT3exSBMal+Ou1w==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"yaml": "^2.2.2"
|
"yaml": "^2.2.2"
|
||||||
|
|||||||
@ -29,7 +29,7 @@
|
|||||||
"@actions/github": "^9.0.0",
|
"@actions/github": "^9.0.0",
|
||||||
"@actions/tool-cache": "^4.0.0",
|
"@actions/tool-cache": "^4.0.0",
|
||||||
"@octokit/action": "^8.0.4",
|
"@octokit/action": "^8.0.4",
|
||||||
"docker-compose": "^1.3.0"
|
"docker-compose": "^1.3.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@ts-dev-tools/core": "^1.9.14",
|
"@ts-dev-tools/core": "^1.9.14",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user