ci: Remove ./ci docker run image

jrosco · jrosco · commit cbd690c1bf80 · 2025-03-06T11:08:48.000+11:00
This change replaces the `ci docker run [image-name]` with using the
`container` images on the workflows so we can use these images during
workflow runtime and calls commands and scripts from here instead.
diff --git a/.github/workflows/on-pull-request.yaml b/.github/workflows/on-pull-request.yaml
@@ -15,41 +15,51 @@ jobs:
     # Filter out Draft Pull Requests
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
+    container: qctrl/ci-images:python-3.11-ci
+    defaults:
+      run:
+        shell: bash
     steps:
       - uses: actions/checkout@v4
       - name: Ensure no development packages have been set
         run: |
           source <(curl -sL http://ci.q-ctrl.com)
-          ./ci docker run qctrl/ci-images:python-3.11-ci /scripts/check-for-internal-versions.sh
+          /scripts/check-for-internal-versions.sh
   linting:
     # Filter out PRs originating from this repository (triggers on-push.yml instead)
     if: github.event.pull_request.head.repo.fork == true
     runs-on: ubuntu-latest
+    container: qctrl/ci-images:python-3.11-ci
+    defaults:
+      run:
+        shell: bash
     steps:
     - uses: actions/checkout@v4
     - name: Install Python dependencies
       run: |
-        source <(curl -sL http://ci.q-ctrl.com)
-        ./ci docker run qctrl/ci-images:python-3.11-ci /scripts/install-python-dependencies.sh
+        /scripts/install-python-dependencies.sh
     - name: Run Pre-Commit
       run: |
-        ./ci docker run qctrl/ci-images:python-3.11-ci poetry run pre-commit run -- -a
+        poetry run pre-commit run -- -a
   pytest:
     # Filter out PRs originating from this repository (triggers on-push.yml instead)
     if: github.event.pull_request.head.repo.fork == true
     runs-on: ubuntu-latest
+    container: qctrl/ci-images:python-${{ matrix.python }}-ci
+    defaults:
+      run:
+        shell: bash
     strategy:
       matrix:
         python: ["3.9", "3.10", "3.11"]
     steps:
     - uses: actions/checkout@v4
     - name: Install Python dependencies
       run: |
-        source <(curl -sL http://ci.q-ctrl.com)
-        ./ci docker run qctrl/ci-images:python-${{ matrix.python }}-ci /scripts/install-python-dependencies.sh
+        /scripts/install-python-dependencies.sh
     - name: Run Pytest
       run: |
-        ./ci docker run qctrl/ci-images:python-${{ matrix.python }}-ci /scripts/pytest.sh
+        /scripts/pytest.sh
   sphinx_documentation:
     # Filter out PRs originating from this repository (triggers on-push.yml instead)
     if: github.event.pull_request.head.repo.fork == true
diff --git a/.github/workflows/on-push.yaml b/.github/workflows/on-push.yaml
@@ -10,6 +10,10 @@ on:
 jobs:
   housekeeping:
     runs-on: ubuntu-latest
+    container: qctrl/ci-images:google-cloud-sdk-ci
+    defaults:
+      run:
+        shell: bash
     steps:
       - uses: actions/checkout@v4
       - name: Perform housekeeping checks
@@ -18,23 +22,31 @@ jobs:
         run: |
           source <(curl -sL http://ci.q-ctrl.com)
           ./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}
-          ./ci docker run qctrl/ci-images:python-3.11-ci /scripts/housekeeping.sh
+          /scripts/housekeeping.sh
 
   linting:
     runs-on: ubuntu-latest
+    container: qctrl/ci-images:python-3.11-ci
+    defaults:
+      run:
+        shell: bash
     steps:
       - uses: actions/checkout@v4
       - name: Install Python dependencies
         run: |
           source <(curl -sL http://ci.q-ctrl.com)
           ./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}
-          ./ci docker run qctrl/ci-images:python-3.11-ci /scripts/install-python-dependencies.sh
+          /scripts/install-python-dependencies.sh
       - name: Run Pre-Commit
         run: |
-          ./ci docker run qctrl/ci-images:python-3.11-ci poetry run pre-commit run -- -a
+          poetry run pre-commit run -- -a
 
   pytest:
     runs-on: ubuntu-latest
+    container: qctrl/ci-images:python-${{ matrix.python }}-ci
+    defaults:
+      run:
+        shell: bash
     strategy:
       matrix:
         python: ["3.9", "3.10", "3.11"]
@@ -44,13 +56,17 @@ jobs:
         run: |
           source <(curl -sL http://ci.q-ctrl.com)
           ./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}
-          ./ci docker run qctrl/ci-images:python-${{ matrix.python }}-ci /scripts/install-python-dependencies.sh
+          /scripts/install-python-dependencies.sh
       - name: Run Pytest
         run: |
-          ./ci docker run qctrl/ci-images:python-${{ matrix.python }}-ci /scripts/pytest.sh
+          /scripts/pytest.sh
 
   publish_internally:
     runs-on: ubuntu-latest
+    container: qctrl/ci-images:python-3.11-ci
+    defaults:
+      run:
+        shell: bash
     steps:
       - uses: actions/checkout@v4
       - name: Publish development version
@@ -59,4 +75,4 @@ jobs:
         run: |
           source <(curl -sL http://ci.q-ctrl.com)
           ./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}
-          ./ci docker run qctrl/ci-images:python-3.11-ci /scripts/publish-dev-version.sh
+          /scripts/publish-dev-version.sh
diff --git a/.github/workflows/on-release.yaml b/.github/workflows/on-release.yaml
@@ -7,6 +7,10 @@ on:
 jobs:
   release:
     runs-on: ubuntu-latest
+    container: qctrl/ci-images:python-3.11-ci
+    defaults:
+      run:
+      shell: bash
     steps:
       - uses: actions/checkout@v4
         with:
@@ -17,16 +21,15 @@ jobs:
         run: |
           source <(curl -sL http://ci.q-ctrl.com)
           ./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}
-          ./ci docker run qctrl/ci-images:python-3.11-ci /scripts/housekeeping.sh
+          /scripts/housekeeping.sh
       - name: Publish publicly
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          source <(curl -sL http://ci.q-ctrl.com)
-          ./ci docker run qctrl/ci-images:python-3.11-ci /scripts/publish-release-publicly.sh
+          /scripts/publish-release-publicly.sh
       - name: Publish internally
         run: |
-          ./ci docker run qctrl/ci-images:python-3.11-ci /scripts/publish-release-internally.sh
+          /scripts/publish-release-internally.sh
 
   update_documentation:
     runs-on: ubuntu-latest
