Update all image builds to new format. Upload it to Tier2

cmscaltech · Jan 23, 2024 · 448972d · 448972d
1 parent 2035910
commit 448972d
Show file tree

Hide file tree

Showing 6 changed files with 125 additions and 66 deletions.
diff --git a/.github/workflows/build-condor-wn.yml b/.github/workflows/build-condor-wn.yml
@@ -34,7 +34,7 @@ jobs:
         docker login $DOCKER_REGISTRY -u $DOCKER_USER -p $DOCKER_PASSWORD
         docker login $DOCKER_SDN_REGISTRY -u $DOCKER_SDN_USER -p $DOCKER_SDN_PASSWORD
         docker login $DOCKER_TIER2_REGISTRY -u $DOCKER_TIER2_USER -p $DOCKER_TIER2_PASSWORD
-    - name: Build Condor WN Docker image
+    - name: Build Docker image
       run: |
         cd cmscaltech-docker/condor-wn
         docker build . --file Dockerfile \
@@ -45,18 +45,17 @@ jobs:
             --tag $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }} \
             --tag $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
 
-
-    - name: Docker Push Condor WN Image to first registry
+    - name: Docker Push Image to first registry
       run: |
         docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
         docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}
 
-    - name: Docker Push Condor WN Image to second registry
+    - name: Docker Push Image to second registry
       run: |
         docker push $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}
         docker push $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
 
-    - name: Docker Push Condor WN Image to third registry
+    - name: Docker Push Image to third registry
       run: |
         docker push $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}
         docker push $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
diff --git a/.github/workflows/build-dhcp.yml b/.github/workflows/build-dhcp.yml
@@ -18,6 +18,10 @@ jobs:
       DOCKER_SDN_USER: ${{secrets.DOCKER_SDN_USER}}
       DOCKER_SDN_PASSWORD: ${{secrets.DOCKER_SDN_PASSWORD}}
       DOCKER_SDN_REGISTRY: ${{secrets.DOCKER_SDN_REGS}}
+      DOCKER_TIER2_USER: ${{secrets.DOCKER_TIER2_USER}}
+      DOCKER_TIER2_PASSWORD: ${{secrets.DOCKER_TIER2_PASSWORD}}
+      DOCKER_TIER2_REGISTRY: ${{secrets.DOCKER_TIER2_REGS}}
+      IMAGE_NAME: "cmscaltech/dhcp"
     steps:
     - name: Checkout tools repo
       uses: actions/checkout@v3
@@ -29,21 +33,29 @@ jobs:
       run: |
         docker login $DOCKER_REGISTRY -u $DOCKER_USER -p $DOCKER_PASSWORD
         docker login $DOCKER_SDN_REGISTRY -u $DOCKER_SDN_USER -p $DOCKER_SDN_PASSWORD
-
-    - name: Build DHCP Docker image
+        docker login $DOCKER_TIER2_REGISTRY -u $DOCKER_TIER2_USER -p $DOCKER_TIER2_PASSWORD
+    - name: Build Docker image
       run: |
         cd cmscaltech-docker/dhcp
-        docker build . --file Dockerfile --tag cmscaltech/dhcp:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
+        docker build . --file Dockerfile \
+            --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }} \
+            --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) \
+            --tag $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }} \
+            --tag $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) \
+            --tag $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }} \
+            --tag $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
+
+    - name: Docker Push Image to first registry
+      run: |
+        docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
+        docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}
 
-    - name: Docker Push DHCP Image to first registry
+    - name: Docker Push Image to second registry
       run: |
-        docker push cmscaltech/dhcp:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
-        docker tag cmscaltech/dhcp:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) cmscaltech/dhcp:${{ github.event.inputs.buildtag }}
-        docker push cmscaltech/dhcp:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
+        docker push $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}
+        docker push $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
 
-    - name: Docker Push DHCP Image to second registry
+    - name: Docker Push Image to third registry
       run: |
-        docker tag cmscaltech/dhcp:${{ github.event.inputs.buildtag }} $DOCKER_SDN_REGISTRY/cmscaltech/dhcp:${{ github.event.inputs.buildtag }}
-        docker push $DOCKER_SDN_REGISTRY/cmscaltech/dhcp:${{ github.event.inputs.buildtag }}
-        docker tag $DOCKER_SDN_REGISTRY/cmscaltech/dhcp:${{ github.event.inputs.buildtag }} $DOCKER_SDN_REGISTRY/cmscaltech/dhcp:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
-        docker push $DOCKER_SDN_REGISTRY/cmscaltech/dhcp:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
+        docker push $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}
+        docker push $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
diff --git a/.github/workflows/build-no-machine.yml b/.github/workflows/build-no-machine.yml
@@ -18,6 +18,10 @@ jobs:
       DOCKER_SDN_USER: ${{secrets.DOCKER_SDN_USER}}
       DOCKER_SDN_PASSWORD: ${{secrets.DOCKER_SDN_PASSWORD}}
       DOCKER_SDN_REGISTRY: ${{secrets.DOCKER_SDN_REGS}}
+      DOCKER_TIER2_USER: ${{secrets.DOCKER_TIER2_USER}}
+      DOCKER_TIER2_PASSWORD: ${{secrets.DOCKER_TIER2_PASSWORD}}
+      DOCKER_TIER2_REGISTRY: ${{secrets.DOCKER_TIER2_REGS}}
+      IMAGE_NAME: "cmscaltech/nomachine"
     steps:
     - name: Checkout tools repo
       uses: actions/checkout@v3
@@ -29,21 +33,29 @@ jobs:
       run: |
         docker login $DOCKER_REGISTRY -u $DOCKER_USER -p $DOCKER_PASSWORD
         docker login $DOCKER_SDN_REGISTRY -u $DOCKER_SDN_USER -p $DOCKER_SDN_PASSWORD
-
-    - name: Build NoMachine Docker image
+        docker login $DOCKER_TIER2_REGISTRY -u $DOCKER_TIER2_USER -p $DOCKER_TIER2_PASSWORD
+    - name: Build Docker image
       run: |
         cd cmscaltech-docker/nomachine
-        docker build . --file Dockerfile --tag cmscaltech/nomachine:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
+        docker build . --file Dockerfile \
+            --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }} \
+            --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) \
+            --tag $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }} \
+            --tag $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) \
+            --tag $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }} \
+            --tag $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
+
+    - name: Docker Push Image to first registry
+      run: |
+        docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
+        docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}
 
-    - name: Docker Push NoMachine Image to first registry
+    - name: Docker Push Image to second registry
       run: |
-        docker push cmscaltech/nomachine:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
-        docker tag cmscaltech/nomachine:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) cmscaltech/nomachine:${{ github.event.inputs.buildtag }}
-        docker push cmscaltech/nomachine:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
+        docker push $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}
+        docker push $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
 
-    - name: Docker Push NoMachine Image to second registry
+    - name: Docker Push Image to third registry
       run: |
-        docker tag cmscaltech/nomachine:${{ github.event.inputs.buildtag }} $DOCKER_SDN_REGISTRY/cmscaltech/nomachine:${{ github.event.inputs.buildtag }}
-        docker push $DOCKER_SDN_REGISTRY/cmscaltech/nomachine:${{ github.event.inputs.buildtag }}
-        docker tag $DOCKER_SDN_REGISTRY/cmscaltech/nomachine:${{ github.event.inputs.buildtag }} $DOCKER_SDN_REGISTRY/cmscaltech/nomachine:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
-        docker push $DOCKER_SDN_REGISTRY/cmscaltech/nomachine:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
+        docker push $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}
+        docker push $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
diff --git a/.github/workflows/build-xcache-server.yml b/.github/workflows/build-xcache-server.yml
@@ -18,6 +18,10 @@ jobs:
       DOCKER_SDN_USER: ${{secrets.DOCKER_SDN_USER}}
       DOCKER_SDN_PASSWORD: ${{secrets.DOCKER_SDN_PASSWORD}}
       DOCKER_SDN_REGISTRY: ${{secrets.DOCKER_SDN_REGS}}
+      DOCKER_TIER2_USER: ${{secrets.DOCKER_TIER2_USER}}
+      DOCKER_TIER2_PASSWORD: ${{secrets.DOCKER_TIER2_PASSWORD}}
+      DOCKER_TIER2_REGISTRY: ${{secrets.DOCKER_TIER2_REGS}}
+      IMAGE_NAME: "cmscaltech/xcache-server"
     steps:
     - name: Checkout tools repo
       uses: actions/checkout@v3
@@ -29,21 +33,29 @@ jobs:
       run: |
         docker login $DOCKER_REGISTRY -u $DOCKER_USER -p $DOCKER_PASSWORD
         docker login $DOCKER_SDN_REGISTRY -u $DOCKER_SDN_USER -p $DOCKER_SDN_PASSWORD
-
-    - name: Build XCache Server Docker image
+        docker login $DOCKER_TIER2_REGISTRY -u $DOCKER_TIER2_USER -p $DOCKER_TIER2_PASSWORD
+    - name: Build Docker image
       run: |
         cd cmscaltech-docker/xrootd/xcache-server/
-        docker build . --file Dockerfile --tag cmscaltech/xcache-server:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
+        docker build . --file Dockerfile \
+            --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }} \
+            --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) \
+            --tag $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }} \
+            --tag $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) \
+            --tag $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }} \
+            --tag $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
+
+    - name: Docker Push Image to first registry
+      run: |
+        docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
+        docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}
 
-    - name: Docker Push XCache Server Image to first registry
+    - name: Docker Push Image to second registry
       run: |
-        docker push cmscaltech/xcache-server:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
-        docker tag cmscaltech/xcache-server:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) cmscaltech/xcache-server:${{ github.event.inputs.buildtag }}
-        docker push cmscaltech/xcache-server:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
+        docker push $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}
+        docker push $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
 
-    - name: Docker Push XCache Server Image to second registry
+    - name: Docker Push Image to third registry
       run: |
-        docker tag cmscaltech/xcache-server:${{ github.event.inputs.buildtag }} $DOCKER_SDN_REGISTRY/cmscaltech/xcache-server:${{ github.event.inputs.buildtag }}
-        docker push $DOCKER_SDN_REGISTRY/cmscaltech/xcache-server:${{ github.event.inputs.buildtag }}
-        docker tag $DOCKER_SDN_REGISTRY/cmscaltech/xcache-server:${{ github.event.inputs.buildtag }} $DOCKER_SDN_REGISTRY/cmscaltech/xcache-server:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
-        docker push $DOCKER_SDN_REGISTRY/cmscaltech/xcache-server:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
+        docker push $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}
+        docker push $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
diff --git a/.github/workflows/build-xrootd-stageout-server-sdn.yml b/.github/workflows/build-xrootd-stageout-server-sdn.yml
@@ -1,4 +1,4 @@
-name: Docker Image Build For XRootD Stageout Server For SDN
+name: Docker Image Build For XRootD Stageout Server SDN
 
 on:
   workflow_dispatch:
@@ -18,6 +18,10 @@ jobs:
       DOCKER_SDN_USER: ${{secrets.DOCKER_SDN_USER}}
       DOCKER_SDN_PASSWORD: ${{secrets.DOCKER_SDN_PASSWORD}}
       DOCKER_SDN_REGISTRY: ${{secrets.DOCKER_SDN_REGS}}
+      DOCKER_TIER2_USER: ${{secrets.DOCKER_TIER2_USER}}
+      DOCKER_TIER2_PASSWORD: ${{secrets.DOCKER_TIER2_PASSWORD}}
+      DOCKER_TIER2_REGISTRY: ${{secrets.DOCKER_TIER2_REGS}}
+      IMAGE_NAME: "cmscaltech/xrootd-stageout-server-sdn"
     steps:
     - name: Checkout tools repo
       uses: actions/checkout@v3
@@ -29,21 +33,29 @@ jobs:
       run: |
         docker login $DOCKER_REGISTRY -u $DOCKER_USER -p $DOCKER_PASSWORD
         docker login $DOCKER_SDN_REGISTRY -u $DOCKER_SDN_USER -p $DOCKER_SDN_PASSWORD
-
-    - name: Build XRootD Stageout Server SDN Docker image
+        docker login $DOCKER_TIER2_REGISTRY -u $DOCKER_TIER2_USER -p $DOCKER_TIER2_PASSWORD
+    - name: Build Docker image
       run: |
         cd cmscaltech-docker/xrootd/xrootd-stageout-server-sdn/
-        docker build . --file Dockerfile --tag cmscaltech/xrootd-stageout-server-sdn:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
+        docker build . --file Dockerfile \
+            --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }} \
+            --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) \
+            --tag $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }} \
+            --tag $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) \
+            --tag $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }} \
+            --tag $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
+
+    - name: Docker Push Image to first registry
+      run: |
+        docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
+        docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}
 
-    - name: Docker Push XRootD Stageout Server SDN Image to first registry
+    - name: Docker Push Image to second registry
       run: |
-        docker push cmscaltech/xrootd-stageout-server-sdn:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
-        docker tag cmscaltech/xrootd-stageout-server-sdn:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) cmscaltech/xrootd-stageout-server-sdn:${{ github.event.inputs.buildtag }}
-        docker push cmscaltech/xrootd-stageout-server-sdn:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
+        docker push $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}
+        docker push $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
 
-    - name: Docker Push XRootD Stageout Server SDN Image to second registry
+    - name: Docker Push Image to third registry
       run: |
-        docker tag cmscaltech/xrootd-stageout-server-sdn:${{ github.event.inputs.buildtag }} $DOCKER_SDN_REGISTRY/cmscaltech/xrootd-stageout-server-sdn:${{ github.event.inputs.buildtag }}
-        docker push $DOCKER_SDN_REGISTRY/cmscaltech/xrootd-stageout-server-sdn:${{ github.event.inputs.buildtag }}
-        docker tag $DOCKER_SDN_REGISTRY/cmscaltech/xrootd-stageout-server-sdn:${{ github.event.inputs.buildtag }} $DOCKER_SDN_REGISTRY/cmscaltech/xrootd-stageout-server-sdn:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
-        docker push $DOCKER_SDN_REGISTRY/cmscaltech/xrootd-stageout-server-sdn:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
+        docker push $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}
+        docker push $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
diff --git a/.github/workflows/build-xrootd-stageout-server.yml b/.github/workflows/build-xrootd-stageout-server.yml
@@ -18,6 +18,10 @@ jobs:
       DOCKER_SDN_USER: ${{secrets.DOCKER_SDN_USER}}
       DOCKER_SDN_PASSWORD: ${{secrets.DOCKER_SDN_PASSWORD}}
       DOCKER_SDN_REGISTRY: ${{secrets.DOCKER_SDN_REGS}}
+      DOCKER_TIER2_USER: ${{secrets.DOCKER_TIER2_USER}}
+      DOCKER_TIER2_PASSWORD: ${{secrets.DOCKER_TIER2_PASSWORD}}
+      DOCKER_TIER2_REGISTRY: ${{secrets.DOCKER_TIER2_REGS}}
+      IMAGE_NAME: "cmscaltech/xrootd-stageout-server"
     steps:
     - name: Checkout tools repo
       uses: actions/checkout@v3
@@ -29,21 +33,29 @@ jobs:
       run: |
         docker login $DOCKER_REGISTRY -u $DOCKER_USER -p $DOCKER_PASSWORD
         docker login $DOCKER_SDN_REGISTRY -u $DOCKER_SDN_USER -p $DOCKER_SDN_PASSWORD
+        docker login $DOCKER_TIER2_REGISTRY -u $DOCKER_TIER2_USER -p $DOCKER_TIER2_PASSWORD
+    - name: Build Docker image
+      run: |
+        cd cmscaltech-docker/xrootd/xrootd-stageout-server/
+        docker build . --file Dockerfile \
+            --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }} \
+            --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) \
+            --tag $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }} \
+            --tag $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) \
+            --tag $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }} \
+            --tag $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
 
-    - name: Build XRootD Stageout Server Docker image
+    - name: Docker Push Image to first registry
       run: |
-        cd cmscaltech-docker/xrootd/xrootd-stageout-server
-        docker build . --file Dockerfile --tag cmscaltech/xrootd-stageout-server:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
+        docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
+        docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}
 
-    - name: Docker Push XRootD Stageout Server Image to first registry
+    - name: Docker Push Image to second registry
       run: |
-        docker push cmscaltech/xrootd-stageout-server:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
-        docker tag cmscaltech/xrootd-stageout-server:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) cmscaltech/xrootd-stageout-server:${{ github.event.inputs.buildtag }}
-        docker push cmscaltech/xrootd-stageout-server:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
+        docker push $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}
+        docker push $DOCKER_SDN_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
 
-    - name: Docker Push XRootD Stageout Server Image to second registry
+    - name: Docker Push Image to third registry
       run: |
-        docker tag cmscaltech/xrootd-stageout-server:${{ github.event.inputs.buildtag }} $DOCKER_SDN_REGISTRY/cmscaltech/xrootd-stageout-server:${{ github.event.inputs.buildtag }}
-        docker push $DOCKER_SDN_REGISTRY/cmscaltech/xrootd-stageout-server:${{ github.event.inputs.buildtag }}
-        docker tag $DOCKER_SDN_REGISTRY/cmscaltech/xrootd-stageout-server:${{ github.event.inputs.buildtag }} $DOCKER_SDN_REGISTRY/cmscaltech/xrootd-stageout-server:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
-        docker push $DOCKER_SDN_REGISTRY/cmscaltech/xrootd-stageout-server:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
+        docker push $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}
+        docker push $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)