From b83532d5cfb2c110e085be7cdbd7a8d5a037b289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <andre.bauer@staffbase.com>
Date: Wed, 15 Feb 2023 14:35:50 +0100
Subject: [PATCH] adjust Dockerfile & add Dependabot & CI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: André Bauer <andre.bauer@staffbase.com>
---
 .github/workflows/docker-release.yaml  | 13 +++++++++++++
 .github/workflows/release-drafter.yaml |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-release.yaml b/.github/workflows/docker-release.yaml
index 2e9d681..a73e2d5 100644
--- a/.github/workflows/docker-release.yaml
+++ b/.github/workflows/docker-release.yaml
@@ -22,18 +22,31 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
+<<<<<<< HEAD
       - name: Login to Docker Hub
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
+=======
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+>>>>>>> aba9ea0 (adjust Dockerfile & add Dependabot & CI)
 
       - name: Docker metadata action
         id: meta
         uses: docker/metadata-action@v4
         with:
           images: |
+<<<<<<< HEAD
             monotek/cvdupdate
+=======
+            ghcr.io/${{ github.repository_owner }}/cvdupdate
+>>>>>>> aba9ea0 (adjust Dockerfile & add Dependabot & CI)
           tags: |
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
             type=ref,event=branch
diff --git a/.github/workflows/release-drafter.yaml b/.github/workflows/release-drafter.yaml
index 46e6a10..267d6f0 100644
--- a/.github/workflows/release-drafter.yaml
+++ b/.github/workflows/release-drafter.yaml
@@ -3,7 +3,7 @@ name: Release Drafter
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     types: [opened, reopened, synchronize]