From 17691273424eb258de94788dbc793bd3f61a197b Mon Sep 17 00:00:00 2001 From: Dave Gallant Date: Thu, 19 Feb 2026 22:14:54 -0500 Subject: [PATCH] Use dhi.io base images --- .github/workflows/publish-containers.yml | 13 ++++++++++++- Dockerfile | 5 ++--- backend/Dockerfile | 5 ++--- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish-containers.yml b/.github/workflows/publish-containers.yml index 0a7c3d8..83076d1 100644 --- a/.github/workflows/publish-containers.yml +++ b/.github/workflows/publish-containers.yml @@ -1,9 +1,11 @@ name: Publish Containers -on: +on: push: branches: - main pull_request: + schedule: + - cron: "0 0 * * 0" jobs: publish-backend: @@ -28,6 +30,14 @@ jobs: TAGS="$TAGS,${IMAGE_NAME}:latest" fi echo ::set-output name=tags::${TAGS} + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + registry: dhi.io + username: ${{ secrets.DOCKER_USER }} + password: ${{ secrets.DOCKER_TOKEN }} + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -68,6 +78,7 @@ jobs: TAGS="$TAGS,${IMAGE_NAME}:latest" fi echo ::set-output name=tags::${TAGS} + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 diff --git a/Dockerfile b/Dockerfile index 6cc5fc5..4a2cc8f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20.2.0-alpine3.16 as builder +FROM dhi.io/node:25-debian13-dev as builder WORKDIR /app @@ -10,11 +10,10 @@ COPY . . RUN npm run build -FROM caddy:2.10.2-alpine as runtime +FROM dhi.io/caddy:2 as runtime WORKDIR /my-site COPY --from=builder /app/dist ./ COPY Caddyfile /etc/caddy/Caddyfile - diff --git a/backend/Dockerfile b/backend/Dockerfile index deb1782..794ea51 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,5 +1,4 @@ -# syntax=docker/dockerfile:1.21 -FROM cgr.dev/chainguard/go:latest AS build +FROM dhi.io/golang:1.26-debian13-dev AS build WORKDIR /src @@ -7,7 +6,7 @@ COPY . /src RUN CGO_ENABLED=0 go build -o backend . -FROM cgr.dev/chainguard/static:latest +FROM dhi.io/static:20251003-musl-alpine3.23 COPY --from=build /src/backend /backend