using dockerfile as relative to context

openzim · Dec 22, 2020 · 6d366cd · 6d366cd
1 parent 3e5c75e
commit 6d366cd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/action.yml b/action.yml
@@ -9,9 +9,9 @@ inputs:
     required: false
     default: .
   dockerfile:
-    description: Dockerfile path (relative to repo root) if not './Dockerfile'
+    description: Dockerfile path (relative to context) if not 'Dockerfile'
     required: false
-    default: ./Dockerfile
+    default: Dockerfile
   on-master:
     description: tag to use on master commits. (ex. 'latest' or 'dev') Leave out if not wanted
     required: false

diff --git a/build_push.py b/build_push.py
@@ -13,7 +13,7 @@
     sys.exit(0)
 
 context = os.getenv("CONTEXT", ".")
-dockerfile = os.getenv("DOCKERFILE", "./Dockerfile")
+dockerfile = os.path.join(context, os.getenv("DOCKERFILE", "Dockerfile"))
 
 # login to dockerhub
 print("Logging into Docker hub…")