Update builds

cmscaltech · Jan 30, 2024 · acd1146 · acd1146
1 parent 6c61684
commit acd1146
Show file tree

Hide file tree

Showing 8 changed files with 208 additions and 79 deletions.
diff --git a/.github/workflows/build-condor-wn.yml b/.github/workflows/build-condor-wn.yml
@@ -1,5 +1,6 @@
 name: Docker Image Build For Condor WN
 
+
 on:
   workflow_dispatch:
     inputs:
@@ -13,31 +14,52 @@ jobs:
     runs-on: ubuntu-latest
     env:
       DOCKER_USER: ${{secrets.DOCKER_USER}}
-      DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
       DOCKER_REGISTRY: ${{secrets.DOCKER_REGS}}
       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/condor-wn"
+      IMAGE_NAME: "cmscaltech/dhcp"
+      BUILD_DIR: "cmscaltech-docker/condor-wn"
     steps:
     - name: Checkout tools repo
       uses: actions/checkout@v3
       with:
         repository: cmscaltech/docker
         path: cmscaltech-docker
 
-    - name: docker login
-      run: |
-        docker login $DOCKER_REGISTRY -u $DOCKER_USER --password-stdin $DOCKER_PASSWORD
-        docker login $DOCKER_SDN_REGISTRY -u $DOCKER_SDN_USER --password-stdin $DOCKER_SDN_PASSWORD
-        docker login $DOCKER_TIER2_REGISTRY -u $DOCKER_TIER2_USER --password-stdin $DOCKER_TIER2_PASSWORD
+    - name: Login to First Docker Registry
+      id: dockerOne
+      if: always()
+      uses: docker/login-action@v3
+      with:
+        registry: ${{secrets.DOCKER_REGS}}
+        username: ${{secrets.DOCKER_USER}}
+        password: ${{secrets.DOCKER_PASSWORD}}
+
+    - name: Login to Second Docker Registry
+      id: dockerTwo
+      if: always()
+      uses: docker/login-action@v3
+      with:
+        registry: ${{secrets.DOCKER_SDN_REGS}}
+        username: ${{secrets.DOCKER_SDN_USER}}
+        password: ${{secrets.DOCKER_SDN_PASSWORD}}
+
+    - name: Login to Thrid Docker Registry
+      id: dockerThree
+      if: always()
+      uses: docker/login-action@v3
+      with:
+        registry: ${{secrets.DOCKER_TIER2_REGS}}
+        username: ${{secrets.DOCKER_TIER2_USER}}
+        password: ${{secrets.DOCKER_TIER2_PASSWORD}}
+
     - name: Build Docker image
       id: mainRun
+      if: always() && (steps.dockerOne.outcome == 'success' || steps.dockerTwo.outcome == 'success' || steps.dockerThree.outcome == 'success')
       run: |
-        cd cmscaltech-docker/condor-wn
+        cd $BUILD_DIR
         docker build . --file Dockerfile \
             --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }} \
             --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) \
@@ -47,19 +69,19 @@ jobs:
             --tag $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
 
     - name: Docker Push Image to first registry
-      if: always() && steps.mainRun.outcome == 'success'
+      if: always() && (steps.mainRun.outcome == 'success' && steps.dockerOne.outcome == 'success')
       run: |
         docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
         docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}
 
     - name: Docker Push Image to second registry
-      if: always() && steps.mainRun.outcome == 'success'
+      if: always() && (steps.mainRun.outcome == 'success' && steps.dockerTwo.outcome == 'success')
       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 Image to third registry
-      if: always() && steps.mainRun.outcome == 'success'
+      if: always() && (steps.mainRun.outcome == 'success' && steps.dockerThree.outcome == 'success')
       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
@@ -19,6 +19,7 @@ jobs:
       DOCKER_TIER2_USER: ${{secrets.DOCKER_TIER2_USER}}
       DOCKER_TIER2_REGISTRY: ${{secrets.DOCKER_TIER2_REGS}}
       IMAGE_NAME: "cmscaltech/dhcp"
+      BUILD_DIR: "cmscaltech-docker/dhcp"
     steps:
     - name: Checkout tools repo
       uses: actions/checkout@v3
@@ -57,7 +58,7 @@ jobs:
       id: mainRun
       if: always() && (steps.dockerOne.outcome == 'success' || steps.dockerTwo.outcome == 'success' || steps.dockerThree.outcome == 'success')
       run: |
-        cd cmscaltech-docker/dhcp
+        cd $BUILD_DIR
         docker build . --file Dockerfile \
             --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }} \
             --tag $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
@@ -1,5 +1,6 @@
 name: Docker Image Build For NoMachine
 
+
 on:
   workflow_dispatch:
     inputs:
@@ -13,31 +14,52 @@ jobs:
     runs-on: ubuntu-latest
     env:
       DOCKER_USER: ${{secrets.DOCKER_USER}}
-      DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
       DOCKER_REGISTRY: ${{secrets.DOCKER_REGS}}
       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"
+      IMAGE_NAME: "cmscaltech/dhcp"
+      BUILD_DIR: "cmscaltech-docker/nomachine"
     steps:
     - name: Checkout tools repo
       uses: actions/checkout@v3
       with:
         repository: cmscaltech/docker
         path: cmscaltech-docker
 
-    - name: docker login
-      run: |
-        docker login $DOCKER_REGISTRY -u $DOCKER_USER --password-stdin $DOCKER_PASSWORD
-        docker login $DOCKER_SDN_REGISTRY -u $DOCKER_SDN_USER --password-stdin $DOCKER_SDN_PASSWORD
-        docker login $DOCKER_TIER2_REGISTRY -u $DOCKER_TIER2_USER --password-stdin $DOCKER_TIER2_PASSWORD
+    - name: Login to First Docker Registry
+      id: dockerOne
+      if: always()
+      uses: docker/login-action@v3
+      with:
+        registry: ${{secrets.DOCKER_REGS}}
+        username: ${{secrets.DOCKER_USER}}
+        password: ${{secrets.DOCKER_PASSWORD}}
+
+    - name: Login to Second Docker Registry
+      id: dockerTwo
+      if: always()
+      uses: docker/login-action@v3
+      with:
+        registry: ${{secrets.DOCKER_SDN_REGS}}
+        username: ${{secrets.DOCKER_SDN_USER}}
+        password: ${{secrets.DOCKER_SDN_PASSWORD}}
+
+    - name: Login to Thrid Docker Registry
+      id: dockerThree
+      if: always()
+      uses: docker/login-action@v3
+      with:
+        registry: ${{secrets.DOCKER_TIER2_REGS}}
+        username: ${{secrets.DOCKER_TIER2_USER}}
+        password: ${{secrets.DOCKER_TIER2_PASSWORD}}
+
     - name: Build Docker image
       id: mainRun
+      if: always() && (steps.dockerOne.outcome == 'success' || steps.dockerTwo.outcome == 'success' || steps.dockerThree.outcome == 'success')
       run: |
-        cd cmscaltech-docker/nomachine
+        cd $BUILD_DIR
         docker build . --file Dockerfile \
             --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }} \
             --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) \
@@ -47,19 +69,19 @@ jobs:
             --tag $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
 
     - name: Docker Push Image to first registry
-      if: always() && steps.mainRun.outcome == 'success'
+      if: always() && (steps.mainRun.outcome == 'success' && steps.dockerOne.outcome == 'success')
       run: |
         docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
         docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}
 
     - name: Docker Push Image to second registry
-      if: always() && steps.mainRun.outcome == 'success'
+      if: always() && (steps.mainRun.outcome == 'success' && steps.dockerTwo.outcome == 'success')
       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 Image to third registry
-      if: always() && steps.mainRun.outcome == 'success'
+      if: always() && (steps.mainRun.outcome == 'success' && steps.dockerThree.outcome == 'success')
       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-xcache-server.yml b/.github/workflows/build-xcache-server.yml
@@ -13,31 +13,52 @@ jobs:
     runs-on: ubuntu-latest
     env:
       DOCKER_USER: ${{secrets.DOCKER_USER}}
-      DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
       DOCKER_REGISTRY: ${{secrets.DOCKER_REGS}}
       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"
+      IMAGE_NAME: "cmscaltech/dhcp"
+      BUILD_DIR: "cmscaltech-docker/xrootd/xcache-server/"
     steps:
     - name: Checkout tools repo
       uses: actions/checkout@v3
       with:
         repository: cmscaltech/docker
         path: cmscaltech-docker
 
-    - name: docker login
-      run: |
-        docker login $DOCKER_REGISTRY -u $DOCKER_USER --password-stdin $DOCKER_PASSWORD
-        docker login $DOCKER_SDN_REGISTRY -u $DOCKER_SDN_USER --password-stdin $DOCKER_SDN_PASSWORD
-        docker login $DOCKER_TIER2_REGISTRY -u $DOCKER_TIER2_USER --password-stdin $DOCKER_TIER2_PASSWORD
+    - name: Login to First Docker Registry
+      id: dockerOne
+      if: always()
+      uses: docker/login-action@v3
+      with:
+        registry: ${{secrets.DOCKER_REGS}}
+        username: ${{secrets.DOCKER_USER}}
+        password: ${{secrets.DOCKER_PASSWORD}}
+
+    - name: Login to Second Docker Registry
+      id: dockerTwo
+      if: always()
+      uses: docker/login-action@v3
+      with:
+        registry: ${{secrets.DOCKER_SDN_REGS}}
+        username: ${{secrets.DOCKER_SDN_USER}}
+        password: ${{secrets.DOCKER_SDN_PASSWORD}}
+
+    - name: Login to Thrid Docker Registry
+      id: dockerThree
+      if: always()
+      uses: docker/login-action@v3
+      with:
+        registry: ${{secrets.DOCKER_TIER2_REGS}}
+        username: ${{secrets.DOCKER_TIER2_USER}}
+        password: ${{secrets.DOCKER_TIER2_PASSWORD}}
+
     - name: Build Docker image
       id: mainRun
+      if: always() && (steps.dockerOne.outcome == 'success' || steps.dockerTwo.outcome == 'success' || steps.dockerThree.outcome == 'success')
       run: |
-        cd cmscaltech-docker/xrootd/xcache-server/
+        cd $BUILD_DIR
         docker build . --file Dockerfile \
             --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }} \
             --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) \
@@ -47,19 +68,19 @@ jobs:
             --tag $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
 
     - name: Docker Push Image to first registry
-      if: always() && steps.mainRun.outcome == 'success'
+      if: always() && (steps.mainRun.outcome == 'success' && steps.dockerOne.outcome == 'success')
       run: |
         docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
         docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}
 
     - name: Docker Push Image to second registry
-      if: always() && steps.mainRun.outcome == 'success'
+      if: always() && (steps.mainRun.outcome == 'success' && steps.dockerTwo.outcome == 'success')
       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 Image to third registry
-      if: always() && steps.mainRun.outcome == 'success'
+      if: always() && (steps.mainRun.outcome == 'success' && steps.dockerThree.outcome == 'success')
       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-xrootd-mon.yml b/.github/workflows/build-xrootd-mon.yml
@@ -13,31 +13,52 @@ jobs:
     runs-on: ubuntu-latest
     env:
       DOCKER_USER: ${{secrets.DOCKER_USER}}
-      DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
       DOCKER_REGISTRY: ${{secrets.DOCKER_REGS}}
       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-mon"
+      IMAGE_NAME: "cmscaltech/dhcp"
+      BUILD_DIR: "cmscaltech-docker/xrootd/xrootd-mon/"
     steps:
     - name: Checkout tools repo
       uses: actions/checkout@v3
       with:
         repository: cmscaltech/docker
         path: cmscaltech-docker
 
-    - name: docker login
-      run: |
-        docker login $DOCKER_REGISTRY -u $DOCKER_USER --password-stdin $DOCKER_PASSWORD
-        docker login $DOCKER_SDN_REGISTRY -u $DOCKER_SDN_USER --password-stdin $DOCKER_SDN_PASSWORD
-        docker login $DOCKER_TIER2_REGISTRY -u $DOCKER_TIER2_USER --password-stdin $DOCKER_TIER2_PASSWORD
+    - name: Login to First Docker Registry
+      id: dockerOne
+      if: always()
+      uses: docker/login-action@v3
+      with:
+        registry: ${{secrets.DOCKER_REGS}}
+        username: ${{secrets.DOCKER_USER}}
+        password: ${{secrets.DOCKER_PASSWORD}}
+
+    - name: Login to Second Docker Registry
+      id: dockerTwo
+      if: always()
+      uses: docker/login-action@v3
+      with:
+        registry: ${{secrets.DOCKER_SDN_REGS}}
+        username: ${{secrets.DOCKER_SDN_USER}}
+        password: ${{secrets.DOCKER_SDN_PASSWORD}}
+
+    - name: Login to Thrid Docker Registry
+      id: dockerThree
+      if: always()
+      uses: docker/login-action@v3
+      with:
+        registry: ${{secrets.DOCKER_TIER2_REGS}}
+        username: ${{secrets.DOCKER_TIER2_USER}}
+        password: ${{secrets.DOCKER_TIER2_PASSWORD}}
+
     - name: Build Docker image
       id: mainRun
+      if: always() && (steps.dockerOne.outcome == 'success' || steps.dockerTwo.outcome == 'success' || steps.dockerThree.outcome == 'success')
       run: |
-        cd cmscaltech-docker/xrootd/xrootd-mon/
+        cd $BUILD_DIR
         docker build . --file Dockerfile \
             --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }} \
             --tag $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d) \
@@ -47,19 +68,19 @@ jobs:
             --tag $DOCKER_TIER2_REGISTRY/$IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
 
     - name: Docker Push Image to first registry
-      if: always() && steps.mainRun.outcome == 'success'
+      if: always() && (steps.mainRun.outcome == 'success' && steps.dockerOne.outcome == 'success')
       run: |
         docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}-$(date +%Y%m%d)
         docker push $IMAGE_NAME:${{ github.event.inputs.buildtag }}
 
     - name: Docker Push Image to second registry
-      if: always() && steps.mainRun.outcome == 'success'
+      if: always() && (steps.mainRun.outcome == 'success' && steps.dockerTwo.outcome == 'success')
       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 Image to third registry
-      if: always() && steps.mainRun.outcome == 'success'
+      if: always() && (steps.mainRun.outcome == 'success' && steps.dockerThree.outcome == 'success')
       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)