#3: Fix promise + name

manusa · Sep 22, 2019 · 6cd454b · 6cd454b
1 parent ce52d7e
commit 6cd454b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/docker.js b/src/docker.js
@@ -2,9 +2,8 @@
 
 const child_process = require('child_process');
 
-const build = inputs => {
-  console.log('Building docker image');
-  const imageName = `${inputs.name}:${inputs.tag}`;
+const build = imageName => {
+  console.log(`Building docker image: ${imageName}`);
   child_process.execSync(`docker build -t ${imageName} .`)
 };
 

diff --git a/src/index.js b/src/index.js
@@ -15,12 +15,13 @@ const canPerformAction = inputs => {
   return true;
 };
 
-const run = () => {
+const run = async () => {
   const inputs = loadInputs();
   if (canPerformAction(inputs)) {
-    const tagName = tag.computeTagName(inputs);
+    const tagName = await tag.computeTagName(inputs);
     console.log(`Tag name for image: ${tagName}`);
-    docker.build(inputs);
+    const imageName = `${inputs.name}:${tagName}`;
+    docker.build(imageName);
     docker.login(inputs);
     docker.push(inputs);
     console.log('Done!');

diff --git a/src/tag.js b/src/tag.js
@@ -6,11 +6,11 @@ const defaultTagName = () =>
     .replace('refs/tags/', '')
     .replace('refs/pull/', '');
 
-const computeTagName = inputs => {
+const computeTagName = async inputs => {
   if (inputs.tag) {
     return inputs.tag;
   } else if (inputs.tagScript) {
-    return script(inputs.tagScript);
+    return await script(inputs.tagScript);
   }
   return defaultTagName();
 };