actions/docker-build-push
1
0
Fork 0
mirror of https://github.com/docker/build-push-action.git synced 2024-12-25 16:22:12 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #470 from crazy-max/fix-outputs

Browse source 
Don't set outputs if empty or nil
This commit is contained in:
CrazyMax 2021-09-24 16:52:57 +02:00 committed by GitHub
commit 291bae5a41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dist/index.js generated vendored
View file

@ -57,7 +57,7 @@ function getImageID() {
if (!fs_1.default.existsSync(iidFile)) { if (!fs_1.default.existsSync(iidFile)) {
return undefined; return undefined;
} }
return fs_1.default.readFileSync(iidFile, { encoding: 'utf-8' }); return fs_1.default.readFileSync(iidFile, { encoding: 'utf-8' }).trim();
}); });
} }
exports.getImageID = getImageID; exports.getImageID = getImageID;
@ -73,7 +73,11 @@ function getMetadata() {
if (!fs_1.default.existsSync(metadataFile)) { if (!fs_1.default.existsSync(metadataFile)) {
return undefined; return undefined;
} }
return fs_1.default.readFileSync(metadataFile, { encoding: 'utf-8' }); const content = fs_1.default.readFileSync(metadataFile, { encoding: 'utf-8' }).trim();
if (content === 'null') {
return undefined;
}
return content;
}); });
} }
exports.getMetadata = getMetadata; exports.getMetadata = getMetadata;

8
src/buildx.ts
View file

@ -15,7 +15,7 @@ export async function getImageID(): Promise<string | undefined> {
if (!fs.existsSync(iidFile)) { if (!fs.existsSync(iidFile)) {
return undefined; return undefined;
} }
return fs.readFileSync(iidFile, {encoding: 'utf-8'}); return fs.readFileSync(iidFile, {encoding: 'utf-8'}).trim();
} }
export async function getMetadataFile(): Promise<string> { export async function getMetadataFile(): Promise<string> {
@ -27,7 +27,11 @@ export async function getMetadata(): Promise<string | undefined> {
if (!fs.existsSync(metadataFile)) { if (!fs.existsSync(metadataFile)) {
return undefined; return undefined;
} }
return fs.readFileSync(metadataFile, {encoding: 'utf-8'}); const content = fs.readFileSync(metadataFile, {encoding: 'utf-8'}).trim();
if (content === 'null') {
return undefined;
}
return content;
} }
export async function getSecretString(kvp: string): Promise<string> { export async function getSecretString(kvp: string): Promise<string> {