fix: add repos to build matrix to properly push to each orgs repo

rstudio · Feb 11, 2025 · 5e549db · 5e549db
1 parent 2083ca0
commit 5e549db
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 34 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -53,6 +53,10 @@ on:
         required: true
       DOCKERHUB_TOKEN:
         required: true
+      RSTUDIO_DOCKERHUB_USERNAME:
+        required: true
+      RSTUDIO_DOCKERHUB_TOKEN:
+        required: true
 
 permissions:
   contents: read
@@ -61,31 +65,52 @@ jobs:
   setup-matrix:
     runs-on: ubuntu-latest
     outputs:
-      variants: ${{ steps.setup-matrix.outputs.variants }}
+      matrix: ${{ steps.setup-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up matrix of variants
+      - name: Set up matrix
         id: setup-matrix
         run: |
           if [[ "${{ inputs.variants }}" != "" ]]; then
             variants="${{ inputs.variants }}"
           else
             variants="$(make print-variants)"
           fi
-          variants=$(echo "$variants" | jq -R -c '[splits(" ")]')
-          echo "variants=$variants" >> $GITHUB_OUTPUT
+          
+          # Create matrix combining variants with organization repo
+          matrix=$(echo "$variants" | tr ' ' '\n' | jq -R -n '
+          {
+            "include": [
+              ( inputs | select(length>0) as $variant | [
+                {
+                  variant: $variant,
+                  username_secret: "DOCKERHUB_USERNAME",
+                  token_secret: "DOCKERHUB_TOKEN",
+                  repo: "posit/r-base"
+                },
+                {
+                  variant: $variant,
+                  username_secret: "RSTUDIO_DOCKERHUB_USERNAME",
+                  token_secret: "RSTUDIO_DOCKERHUB_TOKEN",
+                  repo: "rstudio/r-base"
+                }
+              ] )
+              | .[]
+            ]
+          }' | jq -c .)
+          echo "matrix=$matrix" >> $GITHUB_OUTPUT
 
   docker-images:
     needs: setup-matrix
     strategy:
       fail-fast: false
-      matrix:
-        variant: ${{ fromJson(needs.setup-matrix.outputs.variants) }}
+      matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
     runs-on: ubuntu-latest
-    name: Docker images (${{ matrix.variant }})
+    name: Docker images (${{ matrix.repo }}:${{ matrix.variant }})
     env:
       VARIANTS: ${{ matrix.variant }}
+      BASE_IMAGE: ${{ matrix.repo }}
     steps:
       - uses: actions/checkout@v3
 
@@ -95,11 +120,11 @@ jobs:
           driver: docker
           install: true
 
-      - name: Login to Posit DockerHub
+      - name: Login to DockerHub
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ secrets[matrix.username_secret] }}
+          password: ${{ secrets[matrix.token_secret] }}
 
       - name: Setup environment
         run: |
@@ -119,18 +144,7 @@ jobs:
         run: |
           make test-all
 
-      - name: Push Posit images
-        if: ${{ github.ref == 'refs/heads/main' || inputs.publish_images }}
-        run: |
-          make push-all
-
-      - name: Login to RStudio DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.RSTUDIO_DOCKERHUB_USERNAME }}
-          password: ${{ secrets.RSTUDIO_DOCKERHUB_TOKEN }}
-
-      - name: Push RStudio images
+      - name: Push images
         if: ${{ github.ref == 'refs/heads/main' || inputs.publish_images }}
         run: |
-          make push-all-rstudio
+          make push-all
diff --git a/Makefile b/Makefile
@@ -1,5 +1,6 @@
-BASE_IMAGE ?= posit/r-base
+BASE_IMAGE_POSIT ?= posit/r-base
 BASE_IMAGE_RSTUDIO ?= rstudio/r-base
+BASE_IMAGE ?= $(BASE_IMAGE_POSIT)
 VERSIONS ?= 3.1 3.2 3.3 3.4 3.5 3.6 4.0 4.1 4.2 4.3 4.4 devel next
 VARIANTS ?= focal jammy noble bullseye bookworm centos7 rockylinux8 rockylinux9 opensuse155 opensuse156
 
@@ -61,10 +62,6 @@ push-$(version)-$(variant):
 	docker push $(BASE_IMAGE):$(version)-$(variant)
 	IMAGE_NAME=$(BASE_IMAGE):$(version)-$(variant) DOCKER_REPO=$(BASE_IMAGE) bash ./$(version)/$(variant)/hooks/post_push
 
-push-rstudio-$(version)-$(variant):
-	docker push $(BASE_IMAGE_RSTUDIO):$(version)-$(variant)
-	IMAGE_NAME=$(BASE_IMAGE_RSTUDIO):$(version)-$(variant) DOCKER_REPO=$(BASE_IMAGE_RSTUDIO) bash ./$(version)/$(variant)/hooks/post_push
-
 BUILD_R_IMAGES += build-$(version)-$(variant)
 REBUILD_R_IMAGES += rebuild-$(version)-$(variant)
 TEST_R_IMAGES += test-$(version)-$(variant)
@@ -114,16 +111,12 @@ pull-$(version)-$(variant):
 push-$(version)-$(variant):
 	docker push $(BASE_IMAGE):$(version)-$(variant)
 
-push-rstudio-$(version)-$(variant):
-	docker push $(BASE_IMAGE_RSTUDIO):$(version)-$(variant)
-
 ifeq (yes,$(INCLUDE_PATCH_VERSIONS))
 BUILD_R_IMAGES += build-$(version)-$(variant)
 REBUILD_R_IMAGES += rebuild-$(version)-$(variant)
 TEST_R_IMAGES += test-$(version)-$(variant)
 PULL_R_IMAGES += pull-$(version)-$(variant)
 PUSH_R_IMAGES += push-$(version)-$(variant)
-PUSH_R_IMAGES_RSTUDIO += push-rstudio-$(version)-$(variant)
 endif
 endef
 
@@ -143,7 +136,5 @@ pull-all: $(PULL_R_IMAGES)
 
 push-all: $(PUSH_R_IMAGES)
 
-push-all-rstudio: $(PUSH_R_IMAGES_RSTUDIO)
-
 print-variants:
 	@echo $(VARIANTS)