docker/build-push-action
1
0
Fork 0
mirror of https://github.com/docker/build-push-action.git synced 2025-04-04 22:20:07 +02:00
Code Activity

Test failures fixed, added 3 new test cases

Browse source 
Signed-off-by: Jyotsna <Josh-01@github.com>
This commit is contained in:
Jyotsna 2020-11-05 13:53:15 +05:30
parent dd55519eee
commit e2bf0d0cc1
3 changed files with 83 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
__tests__/context.test.ts
View file

@ -10,6 +10,7 @@ jest.spyOn(context, 'tmpDir').mockImplementation((): string => {
const tmpDir = path.join('/tmp/.docker-build-push-jest').split(path.sep).join(path.posix.sep); const tmpDir = path.join('/tmp/.docker-build-push-jest').split(path.sep).join(path.posix.sep);
if (!fs.existsSync(tmpDir)) { if (!fs.existsSync(tmpDir)) {
fs.mkdirSync(tmpDir, {recursive: true}); fs.mkdirSync(tmpDir, {recursive: true});
2;
} }
return tmpDir; return tmpDir;
}); });
@ -146,6 +147,8 @@ describe('getArgs', () => {
[ [
'buildx', 'buildx',
'build', 'build',
'--label', 'org.opencontainers.image.source=https://github.com/docker/build-push-action.git',
'--label', 'dockerfile-path=./test/Dockerfile',
'--platform', 'linux/amd64,linux/arm64', '--platform', 'linux/amd64,linux/arm64',
'--iidfile', '/tmp/.docker-build-push-jest/iidfile', '--iidfile', '/tmp/.docker-build-push-jest/iidfile',
'--secret', 'id=GIT_AUTH_TOKEN,src=/tmp/.docker-build-push-jest/.tmpname-jest', '--secret', 'id=GIT_AUTH_TOKEN,src=/tmp/.docker-build-push-jest/.tmpname-jest',
@ -154,6 +157,59 @@ describe('getArgs', () => {
'--push', '--push',
'https://github.com/docker/build-push-action.git#heads/master' 'https://github.com/docker/build-push-action.git#heads/master'
] ]
],
[
'0.4.2',
new Map<string, string>([
['context', '.'],
['labels', 'org.opencontainers.image.source=UserProvidedSourceLabel'],
['outputs', 'type=image,dest=./release-out']
]),
[
'buildx',
'build',
'--label', 'org.opencontainers.image.source=UserProvidedSourceLabel',
'--label', 'dockerfile-path=Dockerfile',
'--output', 'type=image,dest=./release-out',
'--iidfile', '/tmp/.docker-build-push-jest/iidfile',
'--file', 'Dockerfile',
'.'
]
],
[
'0.4.2',
new Map<string, string>([
['context', '.'],
['outputs', 'type=registry,dest=./release-out']
]),
[
'buildx',
'build',
'--label', 'org.opencontainers.image.source=https://github.com/docker/build-push-action.git',
'--label', 'dockerfile-path=Dockerfile',
'--output', 'type=registry,dest=./release-out',
'--iidfile', '/tmp/.docker-build-push-jest/iidfile',
'--file', 'Dockerfile',
'.'
]
],
[
'0.4.2',
new Map<string, string>([
['context', '.'],
['labels', 'org.opencontainers.image.source=UserProvidedSourceLabel'],
['load', 'true']
]),
[
'buildx',
'build',
'--label', 'org.opencontainers.image.source=UserProvidedSourceLabel',
'--label', 'dockerfile-path=Dockerfile',
'--iidfile', '/tmp/.docker-build-push-jest/iidfile',
'--file', 'Dockerfile',
'--load',
'.'
]
] ]
])( ])(
'given %p with %p as inputs, returns %p', 'given %p with %p as inputs, returns %p',

19
dist/index.js generated vendored
View file

@ -12085,14 +12085,19 @@ function getInputs(defaultContext) {
githubToken: core.getInput('github-token'), githubToken: core.getInput('github-token'),
ssh: yield getInputList('ssh') ssh: yield getInputList('ssh')
}; };
//Add repo as source-label if not already supplied by user if (userInputs.load == true ||
const sourceLabelKey = 'org.opencontainers.image.source'; userInputs.push == true ||
if (userInputs.labels.find(val => val.startsWith(sourceLabelKey) == true) == null) { userInputs.outputs.find(val => val.indexOf('type=image') > -1 || val.indexOf('type=registry') > -1)) {
userInputs.labels.push(`${sourceLabelKey}=https://github.com/${github.context.repo.owner}/${github.context.repo.repo}`); //Add repo as source-label if not already supplied by user
const sourceLabelKey = 'org.opencontainers.image.source';
if (userInputs.labels.find(val => val.startsWith(sourceLabelKey) == true) == null) {
const githubOwnerRepoUrl = defaultContext.split('#')[0];
userInputs.labels.push(`${sourceLabelKey}=${githubOwnerRepoUrl}`);
}
//Add dockerfile path as label
let dockerfilePath = userInputs.file;
userInputs.labels.push(`dockerfile-path=${dockerfilePath}`);
} }
//Add dockerfile path as label
let dockerfilePath = userInputs.file;
userInputs.labels.push(`dockerfile-path=${dockerfilePath}`);
return userInputs; return userInputs;
}); });
} }

25
src/context.ts
View file

@ -76,17 +76,22 @@ export async function getInputs(defaultContext: string): Promise<Inputs> {
ssh: await getInputList('ssh') ssh: await getInputList('ssh')
}; };
//Add repo as source-label if not already supplied by user if (
const sourceLabelKey = 'org.opencontainers.image.source'; userInputs.load == true ||
if (userInputs.labels.find(val => val.startsWith(sourceLabelKey) == true) == null) { userInputs.push == true ||
userInputs.labels.push( userInputs.outputs.find(val => val.indexOf('type=image') > -1 || val.indexOf('type=registry') > -1)
`${sourceLabelKey}=https://github.com/${github.context.repo.owner}/${github.context.repo.repo}` ) {
); //Add repo as source-label if not already supplied by user
} const sourceLabelKey = 'org.opencontainers.image.source';
if (userInputs.labels.find(val => val.startsWith(sourceLabelKey) == true) == null) {
const githubOwnerRepoUrl = defaultContext.split('#')[0];
userInputs.labels.push(`${sourceLabelKey}=${githubOwnerRepoUrl}`);
}
//Add dockerfile path as label //Add dockerfile path as label
let dockerfilePath = userInputs.file; let dockerfilePath = userInputs.file;
userInputs.labels.push(`dockerfile-path=${dockerfilePath}`); userInputs.labels.push(`dockerfile-path=${dockerfilePath}`);
}
return userInputs; return userInputs;
} }