Merge branch 'picasso/runtime-upgrade-10046' of github.com:Composable…

…Fi/composable into picasso/runtime-upgrade-10046
ComposableFi · Jul 25, 2024 · d6aaaf7 · d6aaaf7
2 parents 53060ed + c3d9b8a
commit d6aaaf7
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml
@@ -7,6 +7,8 @@ on:
 env:
   DOCKER_REGISTRY_NAME: composablefi
   DOCKER_USER_OPTION: '$UID:$GID'
+  REGISTRY: ghcr.io
+  IMAGE_NAME: composablefi/composable
 
 jobs:
   release-artifacts:
@@ -30,22 +32,25 @@ jobs:
           fetch-depth: 0
       - uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+          # username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          # password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - run: |
           nix run .#generate-release-artifacts --print-build-logs
           COMPOSABLE_VERSION=$(nix eval --raw .#composable-node.version)
           docker load --input release-artifacts/composable-image
-          docker tag composable:latest "${{ env.DOCKER_REGISTRY_NAME }}/composable:v$COMPOSABLE_VERSION"
-          docker tag composable:latest "${{ env.DOCKER_REGISTRY_NAME }}/composable:latest-prerelease"
-          docker push "${{ env.DOCKER_REGISTRY_NAME }}/composable:v$COMPOSABLE_VERSION"
-          docker push "${{ env.DOCKER_REGISTRY_NAME }}/composable:latest-prerelease"
+          docker tag composable:latest "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:v$COMPOSABLE_VERSION"
+          docker tag composable:latest "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-prerelease"
+          docker push "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:v$COMPOSABLE_VERSION"
+          docker push "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-prerelease"
 
           docker load --input release-artifacts/devnet-image
-          docker tag devnet:latest "${{ env.DOCKER_REGISTRY_NAME }}/devnet:v$COMPOSABLE_VERSION"
-          docker tag devnet:latest "${{ env.DOCKER_REGISTRY_NAME }}/devnet:latest-prerelease"
-          docker push "${{ env.DOCKER_REGISTRY_NAME }}/devnet:v$COMPOSABLE_VERSION"
-          docker push "${{ env.DOCKER_REGISTRY_NAME }}/devnet:latest-prerelease"                    
+          docker tag devnet:latest "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/devnet:v$COMPOSABLE_VERSION"
+          docker tag devnet:latest "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/devnet:latest-prerelease"
+          docker push "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/devnet:v$COMPOSABLE_VERSION"
+          docker push "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/devnet:latest-prerelease"                    
 
       - name: Release artifacts
         uses: softprops/action-gh-release@v1