From 6eb782b5a6e812448e3318c4286796352988bd97 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Sun, 4 Oct 2020 22:49:22 +0300
Subject: [PATCH] Migrate to GitHub Container Registry

from GitHub Packages
https://docs.github.com/en/free-pro-team@latest/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images
---
 .drone.yml                        | 4 ++--
 .github/workflows/dockerimage.yml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 9a05277..9d66ef7 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -20,10 +20,10 @@ steps:
 - name: squid-armhf image for github packages
   image: plugins/docker
   settings:
-    repo: docker.pkg.github.com/b4tman/docker-squid/squid-armhf
+    repo: ghcr.io/b4tman/squid-armhf
     auto_tag: true
     pull_image: true
-    registry: docker.pkg.github.com
+    registry: ghcr.io
     username: b4tman
     password:
       from_secret: github_password
diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index 719d057..bede3ed 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -42,11 +42,11 @@ jobs:
       run: docker build ssl-bump --tag b4tman/squid:ssl-bump
     
     - name: Log into registry
-      run: echo "${{ secrets.GITHUB_PKGS_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
+      run: echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
     
     - name: Push squid image
       run: |
-        IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/squid
+        IMAGE_ID=ghcr.io/${{ github.actor }}/squid
       
         # Strip git ref prefix from version
         VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
@@ -65,7 +65,7 @@ jobs:
     
     - name: Push 'ssl-bump' image
       run: |
-        IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/ssl-bump
+        IMAGE_ID=ghcr.io/${{ github.actor }}/squid-ssl-bump
       
         # Strip git ref prefix from version
         VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')