From b6c62f1628f749b6e4204a251c43cd571cce7ef4 Mon Sep 17 00:00:00 2001
From: PythonGermany <97847597+PythonGermany@users.noreply.github.com>
Date: Sat, 24 May 2025 05:20:23 +0000
Subject: [PATCH 1/4] Update docker-cd to push to ghcr

---
 .github/workflows/docker-cd.yml | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/docker-cd.yml b/.github/workflows/docker-cd.yml
index 34192d2..2c8e32e 100644
--- a/.github/workflows/docker-cd.yml
+++ b/.github/workflows/docker-cd.yml
@@ -14,10 +14,8 @@ on:
       - 'v[0-9]+.[0-9]+.[0-9]+*'
 
 env:
-  # Use docker.io for Docker Hub if empty
-  REGISTRY: docker.io
-  # github.repository as <account>/<repo>
-  IMAGE_NAME: pythongermany/webserv
+  REGISTRY: ghcr.io
+  IMAGE_NAME: webserv
 
 jobs:
   docker-cd:
@@ -25,19 +23,12 @@ jobs:
     permissions:
       contents: read
       packages: write
-      # This is used to complete the identity challenge
-      # with sigstore/fulcio when running outside of PRs.
+      attestations: write
       id-token: write
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-        
-      # Set up BuildKit Docker container builder to be able to build
-      # multi-platform images and export cache
-      # https://github.com/docker/setup-buildx-action
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
 
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action
@@ -46,16 +37,22 @@ jobs:
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
-          username: ${{ vars.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+        
+      # Set up BuildKit Docker container builder to be able to build
+      # multi-platform images and export cache
+      # https://github.com/docker/setup-buildx-action
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
       # Extract metadata (tags, labels) for Docker
       # https://github.com/docker/metadata-action
-      - name: Extract Docker metadata
+      - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          images: ${{ env.REGISTRY }}/${{ github.actor }}/${{ env.IMAGE_NAME }}
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action

From 28133590a20d0a259dfe902cf6363963a61c8da7 Mon Sep 17 00:00:00 2001
From: PythonGermany <97847597+PythonGermany@users.noreply.github.com>
Date: Sat, 24 May 2025 05:28:45 +0000
Subject: [PATCH 2/4] Replace Docker with generic container keyword

---
 .github/workflows/docker-cd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-cd.yml b/.github/workflows/docker-cd.yml
index 2c8e32e..2dcad83 100644
--- a/.github/workflows/docker-cd.yml
+++ b/.github/workflows/docker-cd.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      # Login against a Docker registry except on PR
+      # Login against a container registry except on PR
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
         if: github.event_name != 'pull_request'

From 57106d85b6f9b5838261f07968524de077d55812 Mon Sep 17 00:00:00 2001
From: PythonGermany <97847597+PythonGermany@users.noreply.github.com>
Date: Sat, 24 May 2025 05:29:21 +0000
Subject: [PATCH 3/4] Use repository_owner instead of actor

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .github/workflows/docker-cd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-cd.yml b/.github/workflows/docker-cd.yml
index 2dcad83..6e4bddb 100644
--- a/.github/workflows/docker-cd.yml
+++ b/.github/workflows/docker-cd.yml
@@ -37,7 +37,7 @@ jobs:
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
+          username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
         
       # Set up BuildKit Docker container builder to be able to build

From 80cc89ab2f8cb6488107b7e33686209fd71510a8 Mon Sep 17 00:00:00 2001
From: PythonGermany <97847597+PythonGermany@users.noreply.github.com>
Date: Sat, 24 May 2025 05:29:51 +0000
Subject: [PATCH 4/4] Use repository_owner instead of actor

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .github/workflows/docker-cd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-cd.yml b/.github/workflows/docker-cd.yml
index 6e4bddb..34c77ad 100644
--- a/.github/workflows/docker-cd.yml
+++ b/.github/workflows/docker-cd.yml
@@ -52,7 +52,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/${{ github.actor }}/${{ env.IMAGE_NAME }}
+          images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action