From dd55519eee56167f02ae7dae5adb519d26072391 Mon Sep 17 00:00:00 2001
From: Jyotsna <Josh-01@github.com>
Date: Thu, 5 Nov 2020 12:36:20 +0530
Subject: [PATCH] Removed changes from main module

Signed-off-by: Jyotsna <Josh-01@github.com>
---
 dist/index.js  | 16 ++++++++++------
 src/context.ts |  3 +--
 src/main.ts    |  8 --------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index b439e23..28bb07b 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -2373,7 +2373,6 @@ const context = __importStar(__webpack_require__(842));
 const exec = __importStar(__webpack_require__(757));
 const stateHelper = __importStar(__webpack_require__(647));
 const core = __importStar(__webpack_require__(186));
-const github = __importStar(__webpack_require__(438));
 function run() {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -2388,10 +2387,6 @@ function run() {
             core.info(`📣 Buildx version: ${buildxVersion}`);
             const defContext = context.defaultContext();
             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...`);
             const args = yield context.getArgs(inputs, defContext, buildxVersion);
             yield exec.exec('docker', args).then(res => {
@@ -12069,7 +12064,7 @@ function tmpNameSync(options) {
 exports.tmpNameSync = tmpNameSync;
 function getInputs(defaultContext) {
     return __awaiter(this, void 0, void 0, function* () {
-        return {
+        let userInputs = {
             context: core.getInput('context') || defaultContext,
             file: core.getInput('file') || 'Dockerfile',
             buildArgs: yield getInputList('build-args', true),
@@ -12090,6 +12085,15 @@ function getInputs(defaultContext) {
             githubToken: core.getInput('github-token'),
             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;
diff --git a/src/context.ts b/src/context.ts
index e1fad6d..13a771d 100644
--- a/src/context.ts
+++ b/src/context.ts
@@ -54,7 +54,6 @@ export function tmpNameSync(options?: tmp.TmpNameOptions): string {
 }
 
 export async function getInputs(defaultContext: string): Promise<Inputs> {
-  
   let userInputs = {
     context: core.getInput('context') || defaultContext,
     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
   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(
       `${sourceLabelKey}=https://github.com/${github.context.repo.owner}/${github.context.repo.repo}`
     );
diff --git a/src/main.ts b/src/main.ts
index 063afaa..4a0fae7 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -5,7 +5,6 @@ import * as context from './context';
 import * as exec from './exec';
 import * as stateHelper from './state-helper';
 import * as core from '@actions/core';
-import * as github from '@actions/github';
 
 async function run(): Promise<void> {
   try {
@@ -24,13 +23,6 @@ async function run(): Promise<void> {
     const defContext = context.defaultContext();
     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...`);
     const args: string[] = await context.getArgs(inputs, defContext, buildxVersion);
     await exec.exec('docker', args).then(res => {