From ec3e2960501bbeef7a1299bfb7a8eef6d9136765 Mon Sep 17 00:00:00 2001
From: Nikolaj Bjorner <nbjorner@microsoft.com>
Date: Sat, 25 Dec 2021 17:33:35 -0800
Subject: [PATCH] Update docker-image.yml (#5739)

* Update docker-image.yml

towards tweaking script to use ghcr

* Update docker-image.yml

* Update docker-image.yml

* Update docker-image.yml

change usr/pwd to names that are more descriptive

* Update docker-image.yml

rename back to use DOCKER prefix
it remains to bind to ghcr.io instead of docker.io

* Update ubuntu-20-04.Dockerfile

try to use ghcr instead of docker.io

* Update docker-image.yml

try with chcr token

* Update docker-image.yml

* Update docker-image.yml

* Update docker-image.yml

* Update ubuntu-20-04.Dockerfile

* Update docker-image.yml
---
 .github/workflows/docker-image.yml | 31 ++++++++++++++++--------------
 docker/ubuntu-20-04.Dockerfile     |  2 +-
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index fa02c0aec83..843b1c75ecf 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -7,15 +7,17 @@ on:
 
 jobs:
   push_to_registry:
-    name: Push Docker image to Docker Hub
+    name: Push Docker image to GitHub Docker registry
     runs-on: ubuntu-latest
+
     steps:
-      - name: Check out the repo
+      - name: Check out the repo        
         uses: actions/checkout@v2
 
-      - name: Log in to Docker Hub
+      - name: Log in to GitHub Docker registry
         uses: docker/login-action@v1
         with:
+          registry: ghcr.io
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
@@ -26,7 +28,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v3
         with:
-          images: deemetree/z3-fork
+          images: ghcr.io/z3prover/z3
           flavor: |
             latest=auto
             prefix=ubuntu-20.04-bare-z3-
@@ -37,7 +39,7 @@ jobs:
             type=sha,prefix=ubuntu-20.04-bare-z3-sha-
       - name: Build and push Bare Z3 Docker Image
         uses: docker/build-push-action@v2.7.0
-        with:
+        with:  
           context: .
           push: true
           target: bare-z3
@@ -46,13 +48,14 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
 
       # ------------------------------
-      # Repo description on Docker Hub
+      # Repo description on GHCR
       # ------------------------------
-      - name: Update repo description
-        uses: peter-evans/dockerhub-description@v2
-        with:
-          repository: deemetree/z3-fork
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          short-description: ${{ github.event.repository.description }}
-          readme-filepath: ./docker/README.md
+#      - name: Update repo description
+#        uses: peter-evans/dockerhub-description@v2
+#        with:
+#          registry: ghcr.io        
+#          repository: z3prover/z3
+#          username: ${{ secrets.DOCKER_USERNAME }}
+#          password: ${{ secrets.DOCKER_PASSWORD }}
+#          short-description: ${{ github.event.repository.description }}
+#          readme-filepath: ./docker/README.md
diff --git a/docker/ubuntu-20-04.Dockerfile b/docker/ubuntu-20-04.Dockerfile
index 7f20b753f8a..6a37d05c0eb 100644
--- a/docker/ubuntu-20-04.Dockerfile
+++ b/docker/ubuntu-20-04.Dockerfile
@@ -42,4 +42,4 @@ ENTRYPOINT [ "z3" ]
 # ...
 
 # TODO(optional): introduce C/C++ -binding stage
-# ...
\ No newline at end of file
+# ...