From 0c884844dd136fb5903d5dbd70ed61c8689efb9d Mon Sep 17 00:00:00 2001
From: Martin Tzvetanov Grigorov <mgrigorov@apache.org>
Date: Wed, 4 Oct 2023 15:49:17 +0300
Subject: [PATCH] Restore to the official Docker registry (Quay.io)

Signed-off-by: Martin Tzvetanov Grigorov <mgrigorov@apache.org>
---
 .github/workflows/create-env.yaml | 22 ++++++----------------
 images/create-env/Dockerfile      |  6 ++----
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/create-env.yaml b/.github/workflows/create-env.yaml
index 6a6ae708..d1175ad9 100644
--- a/.github/workflows/create-env.yaml
+++ b/.github/workflows/create-env.yaml
@@ -23,7 +23,7 @@ jobs:
             bioconda_utils_version: 'latest'
             uname_m: 'x86_64'
           - arch: arm64
-            base_image: 'ghcr.io/bioconda/bioconda-utils-build-env-cos7-aarch64'
+            base_image: 'quay.io/bioconda/bioconda-utils-build-env-cos7-aarch64'
             bioconda_utils_version: 'latest'
             uname_m: 'aarch64'
     runs-on: ubuntu-20.04
@@ -66,8 +66,8 @@ jobs:
         containerfiles: |
           ./images/${{ env.IMAGE_NAME }}/Dockerfile
         build-args: |
+          bioconda_utils_version=${{ steps.prepare.outputs.bioconda_utils_version }}
           base_image=${{ matrix.base_image }}
-          bioconda_utils_version=${{ matrix.bioconda_utils_version }}
           conda_arch=${{ matrix.uname_m }}
 
     - name: Test
@@ -124,25 +124,15 @@ jobs:
           done
         done
 
-    - if: always()
-      name: Login to GitHub Container Registry
-      uses: docker/login-action@v2
-      with:
-        registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ github.token }}
-
-    - if: always()
-#      if: ${{ github.ref == 'refs/heads/main' }}
+    - if: ${{ github.ref == 'refs/heads/main' }}
       name: Push
       uses: redhat-actions/push-to-registry@v2
       with:
         image: ${{ steps.buildah-build.outputs.image }}
         tags: ${{ steps.buildah-build.outputs.tags }}
-        # registry: ${{ secrets.QUAY_BIOCONDA_REPO }}
-        registry: ghcr.io/martin-g
-        # username: ${{ secrets.QUAY_BIOCONDA_USERNAME }}
-        # password: ${{ secrets.QUAY_BIOCONDA_TOKEN }}
+        registry: ${{ secrets.QUAY_BIOCONDA_REPO }}
+        username: ${{ secrets.QUAY_BIOCONDA_USERNAME }}
+        password: ${{ secrets.QUAY_BIOCONDA_TOKEN }}
 
     - if: ${{ github.ref == 'refs/heads/main' }}
       name: Test Pushed
diff --git a/images/create-env/Dockerfile b/images/create-env/Dockerfile
index 8009bde0..78204baf 100644
--- a/images/create-env/Dockerfile
+++ b/images/create-env/Dockerfile
@@ -10,8 +10,7 @@ RUN /opt/conda/bin/conda list \
 
 
 # Use Debian instead of BusyBox base since Miniconda currently needs external zlib.
-#FROM quay.io/bioconda/base-glibc-debian-bash as build
-FROM ghcr.io/martin-g/base-glibc-debian-bash as build
+FROM quay.io/bioconda/base-glibc-debian-bash as build
 
 WORKDIR /tmp/work
 COPY --from=bioconda-build-env /tmp/requirements.txt ./
@@ -22,8 +21,7 @@ ADD https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-${conda_arch}.sh
 RUN ./install-conda ./requirements.txt /opt/create-env
 
 
-#FROM quay.io/bioconda/base-glibc-busybox-bash
-FROM ghcr.io/martin-g/base-glibc-busybox-bash
+FROM quay.io/bioconda/base-glibc-busybox-bash
 
 COPY --from=build /opt/create-env /opt/create-env
 # Copy (Bioconda-specific) Conda configuration created by the install-conda script.