Merge 2bc17d5 into eb25d42

jhudsl · Feb 16, 2022 · dfc5c3f · dfc5c3f
2 parents eb25d42 + 2bc17d5
commit dfc5c3f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -54,6 +54,7 @@ jobs:
       toggle_quiz_check: "${{ env.CHECK_QUIZZES }}"
       toggle_render_preview: "${{ env.RENDER_PREVIEW }}"
       toggle_docker_build: "${{ env.DOCKER_BUILD }}"
+      rendering_docker_image: "${{ env.RENDERING_DOCKER_IMAGE }}"
       dockerfiles_changed: steps.verify-changed-files.outputs.files_changed
 
   spell-check:
@@ -307,8 +308,9 @@ jobs:
     needs: yaml-check
     runs-on: ubuntu-latest
     container:
-      image: jhudsl/course_template:main
+      image: ${{needs.yaml-check.outputs.rendering_docker_image}}
     if: ${{needs.yaml-check.outputs.toggle_render_preview == 'yes'}}
+
     steps:
       - name: Checkout files
         uses: actions/checkout@v2

diff --git a/.github/workflows/render-all.yml b/.github/workflows/render-all.yml
@@ -29,13 +29,14 @@ jobs:
       toggle_bookdown: "${{ env.RENDER_BOOKDOWN }}"
       toggle_coursera: "${{ env.RENDER_COURSERA }}"
       toggle_leanpub: "${{ env.RENDER_LEANPUB }}"
+      rendering_docker_image: "${{ env.RENDERING_DOCKER_IMAGE }}"
 
   render-bookdown:
     name: Render bookdown
     needs: yaml-check
     runs-on: ubuntu-latest
     container:
-      image: jhudsl/course_template:main
+      image: ${{needs.yaml-check.outputs.rendering_docker_image}}
     if: ${{needs.yaml-check.outputs.toggle_bookdown == 'yes'}}
 
     steps:
@@ -47,6 +48,7 @@ jobs:
 
       - name: Login as jhudsl-robot
         run: |
+
           git config --local user.email "itcrtrainingnetwork@gmail.com"
           git config --local user.name "jhudsl-robot"
 
@@ -83,7 +85,7 @@ jobs:
     needs: [yaml-check]
     runs-on: ubuntu-latest
     container:
-      image: jhudsl/course_template:main
+      image: ${{needs.yaml-check.outputs.rendering_docker_image}}
     if: ${{needs.yaml-check.outputs.toggle_coursera == 'yes' || needs.yaml-check.outputs.toggle_leanpub == 'yes'}}
 
     steps:
@@ -165,7 +167,7 @@ jobs:
     needs: [yaml-check, render-tocless]
     runs-on: ubuntu-latest
     container:
-      image: jhudsl/course_template:main
+      image: ${{needs.yaml-check.outputs.rendering_docker_image}}
     if: ${{needs.yaml-check.outputs.toggle_coursera == 'yes'}}
 
     steps:

diff --git a/config_automation.yml b/config_automation.yml
@@ -18,3 +18,7 @@ docker-test: no
 render-bookdown: yes
 render-leanpub: no
 render-coursera: no
+
+# What docker image should be used for rendering?
+# The default is jhudsl/course_template:main
+rendering-docker-image: 'jhudsl/course_template:main'