Use docker-container-action with build-args

Dockerfile

@@ -1,4 +1,5 @@
-FROM sphinxdoc/sphinx:2.4.4
+ARG SPHINX_TAG=latest
+FROM sphinxdoc/sphinx:${SPHINX_TAG}
 
 LABEL "maintainer"="Ammar Askar <[email protected]>"
 

README.md

@@ -34,6 +34,7 @@ jobs:
     - uses: ammaraskar/sphinx-action@master
       with:
         docs-folder: "docs/"
+        sphinx-tag: "latest"
 ```
 
 * If you have any Python dependencies that your project needs (themes, 
@@ -43,6 +44,9 @@ folder.
 * If you have multiple sphinx documentation folders, please use multiple
   `uses` blocks.
 
+* If you wish to use a specific version of Sphinx, edit the `sphinx-tag` line in the configuration
+above.
+
 For a full example repo using this action including advanced usage, take a look
 at https://github.com/ammaraskar/sphinx-action-test
 

action.yml

@@ -10,6 +10,11 @@ inputs:
       The folder containing your sphinx docs.
     required: true
     default: "docs/"
+  sphinx-tag:
+    description:
+      The tag to use for sphinxdoc/sphinx.
+    required: false
+    default: "2.4.4"
   build-command:
     description:
       The command used to build your documentation.
@@ -22,5 +27,18 @@ inputs:
       "apt-get update -y && apt-get install -y perl"
     required: false
 runs:
-  using: 'docker'
-  image: 'Dockerfile'
+  using: 'composite'
+  steps:
+    - id: github
+      name: Infer GitHub action repository and ref from GitHub action path
+      uses: ipdxco/docker-container-action/.github/actions/github@v1
+    - uses: ipdxco/docker-container-action@v1
+      env:
+        INPUT_DOCS-FOLDER: ${{ inputs.docs-folder }}
+        INPUT_BUILD-COMMAND: ${{ inputs.build-command }}
+        INPUT_PRE-BUILD-COMMAND: ${{ inputs.pre-build-command }}
+      with:
+        repository: ${{ steps.github.outputs.action_repository }}
+        ref: ${{ steps.github.outputs.action_ref }}
+        build-args: |
+          SPHINX_TAG:${{ inputs.sphinx-tag }}

entrypoint.py

@@ -11,8 +11,9 @@
 
     if "INPUT_PRE-BUILD-COMMAND" in os.environ:
         pre_command = os.environ["INPUT_PRE-BUILD-COMMAND"]
-        print("Running: {}".format(pre_command))
-        os.system(pre_command)
+        if len (pre_command) > 0:  # Check for empty string
+            print("Running: {}".format(pre_command))
+            os.system(pre_command)
 
     github_env = action.GithubEnvironment(
         build_command=os.environ.get("INPUT_BUILD-COMMAND"),