Add BASE_IMG dependency

Author: joshuanianji

.github/workflows/ci.yml

@@ -48,9 +48,17 @@ jobs:
       matrix:
         # based off of the branches in the idris-lsp repo
         idris-lsp-version: ["idris2-0.5.1", "idris2-0.6.0", "latest"]
+        include:
+          - idris-lsp-version: "idris2-0.5.1"
+            idris-version: "v0.5.1"
+          - idris-lsp-version: "idris2-0.6.0"
+            idris-version: "v0.6.0"
+          - idris-lsp-version: "latest"
+            idris-version: "latest"
     uses: ./.github/workflows/version-devcontainer-build-test.yml
     with:
       idris-lsp-version: ${{ matrix.idris-lsp-version }}
+      idris-version: ${{ matrix.idris-version }}
     secrets: inherit
 
   devcontainer-deploy:
@@ -61,8 +69,16 @@ jobs:
     strategy:
       matrix:
         idris-lsp-version: ["idris2-0.5.1", "idris2-0.6.0", "latest"]
+        include:
+          - idris-lsp-version: "idris2-0.5.1"
+            idris-version: "v0.5.1"
+          - idris-lsp-version: "idris2-0.6.0"
+            idris-version: "v0.6.0"
+          - idris-lsp-version: "latest"
+            idris-version: "latest"
       max-parallel: 1 
     uses: ./.github/workflows/version-devcontainer-deploy.yml
     with:
       idris-lsp-version: ${{ matrix.idris-lsp-version }}
+      idris-version: ${{ matrix.idris-version }}
     secrets: inherit

.github/workflows/version-devcontainer-build-test.yml

@@ -6,27 +6,57 @@ on:
       idris-lsp-version:
         required: true
         type: string
+      idris-version:
+        required: true
+        type: string
 
 # Don't allow us to read from packages
 permissions:
   contents: read
 
 jobs:
   devcontainer-build-test:
-    name: Build Devcontainer
+    name: Build Devcontainer - ${{ inputs.idris-lsp-version }}
     runs-on: ubuntu-latest
+    services:
+      registry:
+        image: registry:2
+        ports:
+          - 5000:5000
     env:
+      BASE_TAG: localhost:5000/base-${{ inputs.idris-version }}:latest
       TAG: idris-devcontainer-${{ inputs.idris-lsp-version }}:test
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v3
 
       - name: Setup Buildx (no ARM)
         uses: docker/setup-buildx-action@v2
+        with:
+          # since we're using a local registry
+          driver-opts: network=host
 
       - name: Get Latest Idris Commit SHA
         id: get-sha
         uses: ./.github/actions/get-idris-sha
+      
+      # Building base because devcontainer image depends on it for idris binary
+      # only using cache-from because this should already be cached (we won't be writing to cache)
+      - name: Build Base
+        uses: docker/[email protected]
+        with:
+          context: .
+          file: base.Dockerfile
+          build-args: | 
+            IDRIS_VERSION=${{ inputs.idris-version }}
+            IDRIS_SHA=${{ steps.get-sha.outputs.sha }}
+          tags: ${{ env.BASE_TAG }}
+          # push to local registry
+          push: true
+          cache-from: type=gha,scope=build-base-${{ inputs.idris-version }}
+      
+      - name: Run `docker image ls`
+        run: docker image ls
 
       - name: Build Devcontainer
         uses: docker/[email protected]
@@ -36,9 +66,13 @@ jobs:
           build-args: | 
             IDRIS_LSP_VERSION=${{ inputs.idris-lsp-version }}
             IDRIS_LSP_SHA=${{ steps.get-sha.outputs.lsp-sha }}
+            IDRIS_VERSION=${{ inputs.idris-version }}
+            IDRIS_SHA=${{ steps.get-sha.outputs.idris-sha }}
+            BASE_IMG=${{ env.BASE_TAG }}
           load: true
           tags: ${{ env.TAG }}
           cache-from: type=gha,scope=build-devcontainer-${{ inputs.idris-lsp-version }}
+          cache-to: type=gha,mode=max,scope=build-devcontainer-${{ inputs.idris-lsp-version }}
 
       - name: Setup Bats and Bats libs
         uses: brokenpip3/[email protected]
@@ -55,4 +89,4 @@ jobs:
         run: |
           export LIB_PATH=/usr/lib/
           export DOCKER_IMAGE=${{ env.TAG }}
-          bats tests/devcontainer-idris.bats
+          bats tests/devcontainer-idris.bats

.github/workflows/version-devcontainer-deploy.yml

@@ -6,6 +6,9 @@ on:
       idris-lsp-version:
         required: true
         type: string
+      idris-version:
+        required: true
+        type: string
 
 permissions:
   packages: write
@@ -55,10 +58,14 @@ jobs:
           context: .
           platforms: linux/amd64,linux/arm64
           file: devcontainer.Dockerfile
+          # we run this after base so we can pull the base_img from the registry
           build-args: | 
             IDRIS_LSP_VERSION=${{ inputs.idris-lsp-version }}
             IDRIS_LSP_SHA=${{ steps.get-sha.outputs.lsp-sha }}
-            tags: ghcr.io/${{ github.repository }}/base:${{ inputs.idris-lsp-version }}
-            labels: ${{ steps.create-meta.outputs.labels }}
+            IDRIS_VERSION=${{ inputs.idris-version }}
+            IDRIS_SHA=${{ steps.get-sha.outputs.idris-sha }}
+            BASE_IMG=ghcr.io/joshuanianji/idris-2-docker/base:${{ inputs.idris-version }}
+          tags: ghcr.io/${{ github.repository }}/base:${{ inputs.idris-lsp-version }}
+          labels: ${{ steps.create-meta.outputs.labels }}
           push: true
           cache-from: type=gha,scope=build-devcontainer-${{ inputs.idris-lsp-version }}

devcontainer.Dockerfile

@@ -1,9 +1,10 @@
 ARG IDRIS_VERSION=latest
+ARG BASE_IMG=ghcr.io/joshuanianji/idris-2-docker/base:${IDRIS_VERSION}
 
 # =====
 # Idris Builder
 # Rebuild with correct prefix. Somehow, building from scratch with a different prefix fails
-FROM ghcr.io/joshuanianji/idris-2-docker/base:${IDRIS_VERSION} as idris-builder
+FROM $BASE_IMG as idris-builder
 ARG IDRIS_VERSION
 ARG IDRIS_SHA