From 8da76c5cd910cf239190e9482a11b5e2098c3044 Mon Sep 17 00:00:00 2001 From: Riley Louvier Date: Mon, 15 Dec 2025 13:07:09 -0700 Subject: [PATCH 1/3] Forgot to remove a glob --- .github/workflows/dev_dispatch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev_dispatch.yml b/.github/workflows/dev_dispatch.yml index 94d3014..04350ef 100644 --- a/.github/workflows/dev_dispatch.yml +++ b/.github/workflows/dev_dispatch.yml @@ -109,7 +109,7 @@ jobs: - name: Validate Kubernetes for Deployment # Of course, this would not be a dry run if I had a real cluster to deploy to. uses: docker://ghcr.io/yannh/kubeconform:latest with: - args: "-strict -ignore-missing-schemas ops/*.yaml" + args: "-strict -ignore-missing-schemas ops/deploy.yaml ops/service.yaml ops/hpa.yaml" - name: Upload rendered manifests as build artifacts uses: actions/upload-artifact@v4 From 49855c64d23c51866d924e3039ca1228785d2942 Mon Sep 17 00:00:00 2001 From: Riley Louvier Date: Mon, 15 Dec 2025 13:18:14 -0700 Subject: [PATCH 2/3] Add workflow step to upload to docker --- .github/workflows/dev_dispatch.yml | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dev_dispatch.yml b/.github/workflows/dev_dispatch.yml index 04350ef..93f408e 100644 --- a/.github/workflows/dev_dispatch.yml +++ b/.github/workflows/dev_dispatch.yml @@ -57,7 +57,6 @@ on: required: false default: "60" - jobs: deploy-docker-k8s: runs-on: ubuntu-latest @@ -119,3 +118,26 @@ jobs: ops/deploy.yaml ops/service.yaml ops/hpa.yaml + + - name: Set up Docker Buildx + if: github.event.inputs.push_to_dockerhub == 'true' + uses: docker/setup-buildx-action@v3 + + - name: Log in to Docker Hub + if: github.event.inputs.push_to_dockerhub == 'true' + uses: docker/login-action@v3 + with: + username: ${{ vars.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Build and push image + if: github.event.inputs.push_to_dockerhub == 'true' + uses: docker/build-push-action@v6 + with: + context: . + push: true + build-args: | + BASE_IMAGE=${{ github.event.inputs.base_image }} + tags: | + sadminriley/${{ github.event.inputs.name }}:latest + sadminriley/${{ github.event.inputs.name }}:${{ github.run_number }} From 7a9a0e19583ac070dd37d98f0b42b79a4b1dc54a Mon Sep 17 00:00:00 2001 From: Riley Louvier Date: Mon, 15 Dec 2025 13:22:31 -0700 Subject: [PATCH 3/3] Make base image interchangable with other debian/ubuntu builds --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2fdab09..a38c57e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ # Still in LTS as of june '24. python2 support isn't a thing in 26.04(ubuntu:latest) either -FROM ubuntu:22.04 +ARG BASE_IMAGE=ubuntu:22.04 +FROM ${BASE_IMAGE} ENV DEBIAN_FRONTEND=noninteractive \