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

Removed changes from main module

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

16
dist/index.js generated vendored
View file

@ -2373,7 +2373,6 @@ const context = __importStar(__webpack_require__(842));
const exec = __importStar(__webpack_require__(757)); const exec = __importStar(__webpack_require__(757));
const stateHelper = __importStar(__webpack_require__(647)); const stateHelper = __importStar(__webpack_require__(647));
const core = __importStar(__webpack_require__(186)); const core = __importStar(__webpack_require__(186));
const github = __importStar(__webpack_require__(438));
function run() { function run() {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
try { try {
@ -2388,10 +2387,6 @@ function run() {
core.info(`📣 Buildx version: ${buildxVersion}`); core.info(`📣 Buildx version: ${buildxVersion}`);
const defContext = context.defaultContext(); const defContext = context.defaultContext();
let inputs = yield context.getInputs(defContext); let inputs = yield context.getInputs(defContext);
//Add dockerfile path to label
let dockerfilePath = core.getInput('file') || 'Dockerfile';
inputs.labels.push(`org.opencontainers.image.source=https://github.com/${github.context.repo.owner}/${github.context.repo.repo}`);
inputs.labels.push(`dockerfile-path=${dockerfilePath}`);
core.info(`🏃 Starting build...`); core.info(`🏃 Starting build...`);
const args = yield context.getArgs(inputs, defContext, buildxVersion); const args = yield context.getArgs(inputs, defContext, buildxVersion);
yield exec.exec('docker', args).then(res => { yield exec.exec('docker', args).then(res => {
@ -12069,7 +12064,7 @@ function tmpNameSync(options) {
exports.tmpNameSync = tmpNameSync; exports.tmpNameSync = tmpNameSync;
function getInputs(defaultContext) { function getInputs(defaultContext) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
return { let userInputs = {
context: core.getInput('context') || defaultContext, context: core.getInput('context') || defaultContext,
file: core.getInput('file') || 'Dockerfile', file: core.getInput('file') || 'Dockerfile',
buildArgs: yield getInputList('build-args', true), buildArgs: yield getInputList('build-args', true),
@ -12090,6 +12085,15 @@ 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
const sourceLabelKey = 'org.opencontainers.image.source';
if (userInputs.labels.find(val => val.startsWith(sourceLabelKey) == true) == null) {
userInputs.labels.push(`${sourceLabelKey}=https://github.com/${github.context.repo.owner}/${github.context.repo.repo}`);
}
//Add dockerfile path as label
let dockerfilePath = userInputs.file;
userInputs.labels.push(`dockerfile-path=${dockerfilePath}`);
return userInputs;
}); });
} }
exports.getInputs = getInputs; exports.getInputs = getInputs;

3
src/context.ts
View file

@ -54,7 +54,6 @@ export function tmpNameSync(options?: tmp.TmpNameOptions): string {
} }
export async function getInputs(defaultContext: string): Promise<Inputs> { export async function getInputs(defaultContext: string): Promise<Inputs> {
let userInputs = { let userInputs = {
context: core.getInput('context') || defaultContext, context: core.getInput('context') || defaultContext,
file: core.getInput('file') || 'Dockerfile', file: core.getInput('file') || 'Dockerfile',
@ -79,7 +78,7 @@ export async function getInputs(defaultContext: string): Promise<Inputs> {
//Add repo as source-label if not already supplied by user //Add repo as source-label if not already supplied by user
const sourceLabelKey = 'org.opencontainers.image.source'; const sourceLabelKey = 'org.opencontainers.image.source';
if( userInputs.labels.find(val => val.startsWith(sourceLabelKey) == true ) == null){ if (userInputs.labels.find(val => val.startsWith(sourceLabelKey) == true) == null) {
userInputs.labels.push( userInputs.labels.push(
`${sourceLabelKey}=https://github.com/${github.context.repo.owner}/${github.context.repo.repo}` `${sourceLabelKey}=https://github.com/${github.context.repo.owner}/${github.context.repo.repo}`
); );

8
src/main.ts
View file

@ -5,7 +5,6 @@ import * as context from './context';
import * as exec from './exec'; import * as exec from './exec';
import * as stateHelper from './state-helper'; import * as stateHelper from './state-helper';
import * as core from '@actions/core'; import * as core from '@actions/core';
import * as github from '@actions/github';
async function run(): Promise<void> { async function run(): Promise<void> {
try { try {
@ -24,13 +23,6 @@ async function run(): Promise<void> {
const defContext = context.defaultContext(); const defContext = context.defaultContext();
let inputs: context.Inputs = await context.getInputs(defContext); let inputs: context.Inputs = await context.getInputs(defContext);
//Add dockerfile path to label
let dockerfilePath = core.getInput('file') || 'Dockerfile';
inputs.labels.push(
`org.opencontainers.image.source=https://github.com/${github.context.repo.owner}/${github.context.repo.repo}`
);
inputs.labels.push(`dockerfile-path=${dockerfilePath}`);
core.info(`🏃 Starting build...`); core.info(`🏃 Starting build...`);
const args: string[] = await context.getArgs(inputs, defContext, buildxVersion); const args: string[] = await context.getArgs(inputs, defContext, buildxVersion);
await exec.exec('docker', args).then(res => { await exec.exec('docker', args).then(res => {