diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index ddfced86..aad3a6a2 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -203,7 +203,7 @@ jobs: - name: 🐳 Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: 🔐 Registry Login - run: echo "${{ secrets.REGISTRY_PASS }}" | docker login registry.infra.mintel.me -u "${{ secrets.REGISTRY_USER }}" --password-stdin + run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login git.infra.mintel.me -u "${{ github.actor }}" --password-stdin - name: 🏗️ Build and Push uses: docker/build-push-action@v5 with: @@ -217,7 +217,7 @@ jobs: UMAMI_WEBSITE_ID=${{ secrets.UMAMI_WEBSITE_ID || vars.UMAMI_WEBSITE_ID }} UMAMI_API_ENDPOINT=${{ secrets.UMAMI_API_ENDPOINT || vars.UMAMI_API_ENDPOINT || 'https://analytics.infra.mintel.me' }} NPM_TOKEN=${{ secrets.NPM_TOKEN }} - tags: registry.infra.mintel.me/mintel/klz-2026:${{ needs.prepare.outputs.image_tag }} + tags: git.infra.mintel.me/mmintel/klz-2026:${{ needs.prepare.outputs.image_tag }} secrets: | "NPM_TOKEN=${{ secrets.NPM_TOKEN }}" @@ -363,7 +363,7 @@ jobs: scp .env.deploy root@alpha.mintel.me:$SITE_DIR/$ENV_FILE scp docker-compose.yml root@alpha.mintel.me:$SITE_DIR/docker-compose.yml - ssh root@alpha.mintel.me "cd $SITE_DIR && echo '${{ secrets.REGISTRY_PASS }}' | docker login registry.infra.mintel.me -u '${{ secrets.REGISTRY_USER }}' --password-stdin" + ssh root@alpha.mintel.me "cd $SITE_DIR && echo '${{ secrets.GITHUB_TOKEN }}' | docker login git.infra.mintel.me -u '${{ github.actor }}' --password-stdin" ssh root@alpha.mintel.me "cd $SITE_DIR && docker compose -p '${{ needs.prepare.outputs.project_name }}' --env-file '$ENV_FILE' pull" ssh root@alpha.mintel.me "cd $SITE_DIR && docker compose -p '${{ needs.prepare.outputs.project_name }}' --env-file '$ENV_FILE' up -d --remove-orphans" diff --git a/Dockerfile b/Dockerfile index 3c5f997d..d3e6cfc9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Stage 1: Builder -FROM registry.infra.mintel.me/mintel/nextjs:v1.8.20 AS base +FROM git.infra.mintel.me/mmintel/nextjs:v1.8.20 AS base WORKDIR /app # Arguments for build-time configuration @@ -52,7 +52,7 @@ ENV UV_THREADPOOL_SIZE=3 RUN pnpm build # Stage 2: Runner -FROM registry.infra.mintel.me/mintel/runtime:v1.8.20 AS runner +FROM git.infra.mintel.me/mmintel/runtime:v1.8.20 AS runner WORKDIR /app # Create nextjs user and group (standardized in runtime image but ensuring local ownership) diff --git a/docker-compose.yml b/docker-compose.yml index e2f388a5..80224fb6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: klz-app: - image: registry.infra.mintel.me/mintel/klz-2026:${IMAGE_TAG:-latest} + image: git.infra.mintel.me/mmintel/klz-2026:${IMAGE_TAG:-latest} restart: unless-stopped networks: default: @@ -60,7 +60,7 @@ services: klz-gatekeeper: profiles: [ "gatekeeper" ] - image: registry.infra.mintel.me/mintel/gatekeeper:testing + image: git.infra.mintel.me/mmintel/gatekeeper:testing restart: unless-stopped networks: infra: