Also attempt to push to dockerhub

opensciencegrid · Oct 3, 2024 · a5c452e · a5c452e
1 parent 25a8ee2
commit a5c452e
Showing 1 changed file with 25 additions and 4 deletions.
diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
@@ -93,7 +93,7 @@ jobs:
       #                                         "$CONTAINER_IMAGE"
       #     fi
 
-      - id: upload-by-digest
+      - id: upload-by-digest-harbor
         uses: ./.github/actions/push-digest-local
         with:
           registry: hub.opensciencegrid.org
@@ -107,6 +107,20 @@ jobs:
           timestamp_image: ${{ steps.build-image.outputs.timestamp-image }}
           output_image: ${{ steps.custom-image-name.outputs.output_image }}
 
+      - id: upload-by-digest-dockerhub
+        uses: ./.github/actions/push-digest-local
+        with:
+          registry: docker.io
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          osg_series: ${{ matrix.osg_series }}
+          osg_repo: ${{ matrix.repo }}
+          base_os: ${{ matrix.os }}
+          platform: ${{ matrix.platform }}
+          base_tag: ${{ steps.custom-image-name.outputs.base_tag }}
+          timestamp_image: ${{ steps.build-image.outputs.timestamp-image }}
+          output_image: ${{ steps.custom-image-name.outputs.output_image }}
+
       # - name: Harbor login
       #   # if: >-
       #   #   github.ref == 'refs/heads/master' &&
@@ -189,6 +203,13 @@ jobs:
             repo: development
           - os: cuda_11_8_0
             repo: testing
+        include:
+        - registry: hub.opensciencegrid.org
+          username: OSG_HARBOR_ROBOT_USER
+          password: OSG_HARBOR_ROBOT_PASSWORD
+        - registry: docker.io
+          username: 
+          password: OSG_HARBOR_ROBOT_PASSWORD
     steps:
     - id: base-tag
       env:
@@ -228,16 +249,16 @@ jobs:
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v2
 
-    - name: Harbor login
+    - name: Registry login
       # if: >-
       #   github.ref == 'refs/heads/master' &&
       #   github.event_name != 'pull_request' &&
       #   github.repository_owner == 'opensciencegrid'
       uses: docker/login-action@v2
       with:
         registry: ${{ matrix.registry }}
-        username: ${{ secrets.OSG_HARBOR_ROBOT_USER }}
-        password: ${{ secrets.OSG_HARBOR_ROBOT_PASSWORD }}
+        username: ${{ secrets[matrix.username] }}
+        password: ${{ secrets[matrix.password] }}
 
     - name: Merge Artifacts
       working-directory: /tmp/${{ matrix.registry }}