deprecate consumers

Author: joshuanianji

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

@@ -104,73 +104,3 @@ jobs:
         run: |
           docker run ${{ env.TAG }} /bin/bash -c "make test"
 
-  # "consumer" images just "consume" the base image and do nothing else
-  # basic tests for these
-  consumer-build-test:
-    name: Build Consumer
-    runs-on: ubuntu-latest
-    needs: [base-test-1, base-test-2]
-    strategy:
-      matrix:
-        dockerfile: [debian, ubuntu]
-    # use a local registry
-    services:
-      registry:
-        image: registry:2
-        ports:
-          - 5000:5000
-    env:
-      # use local registry so we can reference the base image in another dockerfile
-      # https://github.com/docker/build-push-action/issues/738
-      BASE_TAG: localhost:5000/base-${{ inputs.idris-version }}:latest
-      TAG: idris-consumer-${{ matrix.dockerfile }}-${{ inputs.idris-version }}:test
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v4
-      
-      - name: Setup Buildx (no ARM)
-        uses: docker/setup-buildx-action@v3
-        with:
-          # since we're using a local registry
-          driver-opts: network=host
-      
-      - name: Build Base Image
-        uses: ./.github/actions/build-base-img
-        with:
-          idris-version: ${{ inputs.idris-version }}
-          push: true
-          tags: ${{ env.BASE_TAG }}
-
-      - name: Run `docker image ls`
-        run: docker image ls
-
-      - name: Build ${{ matrix.dockerfile}}
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ${{ matrix.dockerfile }}.Dockerfile
-          build-args: | 
-            IDRIS_VERSION=${{ inputs.idris-version }}
-            BASE_IMG=${{ env.BASE_TAG }}
-          tags: ${{ env.TAG }}
-          load: true
-      
-      - name: Setup Bats and Bats libs
-        uses: bats-core/[email protected]
-        with:
-          bats-version: 1.10.0
-          support-version: 0.3.0
-          support-path: ${{ github.workspace }}/.bats/bats-support
-          assert-version: 2.1.0
-          assert-path: ${{ github.workspace }}/.bats/bats-assert
-          file-install: false
-          detik-install: false
-
-      # LIB_PATH is a env var I use in the setup() function of my bats tests
-      # it points to the folder containing bats-assert and bats-support
-      - name: Run Test
-        env:
-          LIB_PATH: ${{ github.workspace }}/.bats
-          DOCKER_IMAGE: ${{ env.TAG }}
-          IDRIS_VERSION: ${{ inputs.idris-version }}
-        run: bats tests/consumer-idris.bats

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

@@ -54,46 +54,3 @@ jobs:
           labels: ${{ steps.create-meta.outputs.labels }}
           platforms: linux/amd64,linux/arm64
 
-  deploy-consumers:
-    name: Deploy Consumer
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        dockerfile: [ubuntu, debian]
-    needs: deploy-base
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v4
-      
-      # instead of native builds, we'll just use QEMU for consumers
-      # consumer builds don't really do much intensive stuff anyway
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      
-      - name: Setup Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Docker meta
-        id: create-meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ github.repository }}/${{ matrix.dockerfile }}
-
-      - name: Build ${{ matrix.dockerfile}}
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm64
-          file: ${{ matrix.dockerfile }}.Dockerfile
-          build-args: | 
-            IDRIS_VERSION=${{ inputs.idris-version }}
-            BASE_IMG=ghcr.io/${{ github.repository }}/base:${{ inputs.idris-version }}
-          tags: ghcr.io/${{ github.repository }}/${{ matrix.dockerfile }}:${{ inputs.idris-version }}
-          push: true

README.md

@@ -29,10 +29,8 @@ Installing Idris2 is [quite time consuming](https://idris2.readthedocs.io/en/lat
 
 ## Images
 
-* [idris-2-docker/base](https://github.com/joshuanianji/idris-2-docker/pkgs/container/idris-2-docker%2Fbase) - Base image with Idris2 installed from source.
+* [idris-2-docker/base](https://github.com/joshuanianji/idris-2-docker/pkgs/container/idris-2-docker%2Fbase) - Base image with Idris2 installed from source (debian-based)
 * [idris-2-docker/devcontainer](https://github.com/joshuanianji/idris-2-docker/pkgs/container/idris-2-docker%2Fdevcontainer) - Includes [Idris2 LSP](https://github.com/idris-community/idris2-lsp)
-* [idris-2-docker/ubuntu](https://github.com/joshuanianji/idris-2-docker/pkgs/container/idris-2-docker%2Fubuntu) - Ubuntu 20.04
-* [idris-2-docker/debian](https://github.com/joshuanianji/idris-2-docker/pkgs/container/idris-2-docker%2Fdebian) - Debian bullseye
 
 ## Example Project
 

debian.Dockerfile

@@ -57,7 +57,7 @@ def build_image_sha(image: str, sha_info: dict, idris_base_version: str, tag: st
     parser = argparse.ArgumentParser(description='Builds a docker image')
     parser.add_argument(
         '--image',
-        help='The image to build. One of (base | debian | ubuntu | devcontainer). Defaults to base.',
+        help='The image to build. One of (base | devcontainer). Defaults to base.',
         default='base')
     group = parser.add_mutually_exclusive_group()
     group.add_argument(
@@ -66,7 +66,7 @@ def build_image_sha(image: str, sha_info: dict, idris_base_version: str, tag: st
         default='latest')
     group.add_argument(
         '--sha',
-        help='Idris/Idris LSP SHA to use. Should not be used with `--version`. SHAs also cannot be used with base or debian images.',
+        help='Idris/Idris LSP SHA to use. Should not be used with `--version`. SHAs cannot be used with base images.',
         default=None)
     parser.add_argument(
         '--tag',
@@ -79,8 +79,8 @@ def build_image_sha(image: str, sha_info: dict, idris_base_version: str, tag: st
     )
     args = parser.parse_args()
 
-    if args.image not in ['base', 'debian', 'ubuntu', 'devcontainer']:
-        print('Invalid image. Must be one of (base | debian | ubuntu | devcontainer).')
+    if args.image not in ['base', 'devcontainer']:
+        print('Invalid image. Must be one of (base | devcontainer).')
         exit(1)
 
     if args.version and args.version != 'latest':
@@ -116,10 +116,6 @@ def build_image_sha(image: str, sha_info: dict, idris_base_version: str, tag: st
             print(f'Image built with tag {tag}')
 
     elif args.sha:
-        if args.image in ['base', 'debian']:
-            print('Cannot build base or debian images with a sha.')
-            exit(1)
-
         sha_info = {
             'idris': args.sha,
             'lsp': args.sha