From 0000297e4fba5acbfb0b7cf0f2f21be88a9f5aa9 Mon Sep 17 00:00:00 2001 From: "Debbie (CartSnitch Engineering)" Date: Wed, 18 Mar 2026 23:48:43 +0000 Subject: [PATCH] Revert GHCR mirror configs to Docker Hub direct pulls Replace ghcr.io/cartsnitch/mirror/* images with Docker Hub originals, restore GHCR login guard, and add Docker Hub auth. Refs: CAR-77 Co-Authored-By: Paperclip --- .github/workflows/ci.yml | 7 +++++++ Dockerfile | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f9b668..71f190a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,6 +52,7 @@ jobs: - uses: actions/checkout@v4 - name: Log in to GHCR + if: github.event_name == 'push' && github.ref == 'refs/heads/main' uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} @@ -67,6 +68,12 @@ jobs: type=sha,prefix=sha- type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }} + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Build and push Docker image uses: docker/build-push-action@v6 with: diff --git a/Dockerfile b/Dockerfile index 4fe4b77..6a8b88d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Stage 1: Build -FROM ghcr.io/cartsnitch/mirror/node:20-alpine AS build +FROM node:20-alpine AS build WORKDIR /app @@ -10,7 +10,7 @@ COPY . . RUN npm run build # Stage 2: Production -FROM ghcr.io/cartsnitch/mirror/nginx:stable-alpine AS prod +FROM nginx:stable-alpine AS prod COPY --from=build /app/dist /usr/share/nginx/html COPY nginx.conf /etc/nginx/conf.d/default.conf