adjust Dockerfile & add Dependabot & CI

Signed-off-by: André Bauer <[email protected]>
Cisco-Talos · Jun 26, 2023 · b83532d · b83532d
1 parent 9be7138
commit b83532d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git 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
@@ -3,7 +3,7 @@ name: Release Drafter
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     types: [opened, reopened, synchronize]
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: Release Drafter @@
     on:
       push:
         branches:
-          - master
+          - main
       pull_request:
         types: [opened, reopened, synchronize]
@@ Expand Down @@