Fix REGISTRY_NAMESPACE param

The CI has been updated to install packages from the specified REGISTRY_NAMESPACE.
edewata · Feb 20, 2024 · 5978a49 · 5978a49
1 parent 00fdb21
commit 5978a49
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 1 deletion.
diff --git a/.github/workflows/acme-tests.yml b/.github/workflows/acme-tests.yml
@@ -3,18 +3,24 @@ name: ACME Tests
 on: [push, pull_request]
 
 env:
-  NAMESPACE: ${{ vars.REGISTRY_NAMESPACE || github.repository_owner }}
   BASE_IMAGE: ${{ vars.BASE_IMAGE || 'registry.fedoraproject.org/fedora:latest' }}
   COPR_REPO: ${{ vars.COPR_REPO || '@pki/master' }}
 
 jobs:
   build:
     name: Building ACME images
     runs-on: ubuntu-latest
+    env:
+      NAMESPACE: ${{ vars.REGISTRY_NAMESPACE || 'dogtagpki' }}
     steps:
       - name: Clone repository
         uses: actions/checkout@v4
 
+      - name: Update Dockerfile
+        run: |
+          # update registry namespace
+          sed -i "s/quay.io\/dogtagpki\//quay.io\/$NAMESPACE\//g" Dockerfile
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -111,6 +117,8 @@ jobs:
     name: Publishing ACME images
     needs: build
     runs-on: ubuntu-latest
+    env:
+      NAMESPACE: ${{ vars.REGISTRY_NAMESPACE || github.repository_owner }}
     steps:
       - name: Log in to GitHub Container Registry
         uses: docker/login-action@v3

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,6 +5,7 @@ on: [push, pull_request]
 env:
   BASE_IMAGE: ${{ vars.BASE_IMAGE || 'registry.fedoraproject.org/fedora:latest' }}
   COPR_REPO: ${{ vars.COPR_REPO || '@pki/master' }}
+  NAMESPACE: ${{ vars.REGISTRY_NAMESPACE || 'dogtagpki' }}
 
 jobs:
   # docs/development/Building_PKI.md
@@ -15,6 +16,11 @@ jobs:
       - name: Clone repository
         uses: actions/checkout@v4
 
+      - name: Update Dockerfile
+        run: |
+          # update registry namespace
+          sed -i "s/quay.io\/dogtagpki\//quay.io\/$NAMESPACE\//g" Dockerfile
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 

diff --git a/.github/workflows/sonarcloud-pull.yml b/.github/workflows/sonarcloud-pull.yml
@@ -8,6 +8,7 @@ on:
 env:
   BASE_IMAGE: ${{ vars.BASE_IMAGE || 'registry.fedoraproject.org/fedora:latest' }}
   COPR_REPO: ${{ vars.COPR_REPO || '@pki/master' }}
+  NAMESPACE: ${{ vars.REGISTRY_NAMESPACE || 'dogtagpki' }}
 
 jobs:
   retrieve-pr:
@@ -92,6 +93,11 @@ jobs:
           git fetch pki
           git rebase pki/${{ needs.retrieve-pr.outputs.pr-base }}
 
+      - name: Update Dockerfile
+        run: |
+          # update registry namespace
+          sed -i "s/quay.io\/dogtagpki\//quay.io\/$NAMESPACE\//g" Dockerfile
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -5,15 +5,35 @@ jobs:
   steps:
   - task: PythonScript@0
     displayName: Set environment variables
+    env:
+      REPOSITORY_URI: $(Build.Repository.Uri)
     inputs:
       scriptSource: inline
       script: |
         import os
+        import re
 
         value = os.getenv('BASE_IMAGE', 'registry.fedoraproject.org/fedora:latest')
         print('BASE_IMAGE: {value}'.format(value=value))
         print('##vso[task.setvariable variable=BASE_IMAGE]{value}'.format(value=value))
 
+        value = os.getenv('REGISTRY_NAMESPACE')
+
+        if not value:
+            value = os.getenv('REPOSITORY_URI')
+            print('REPOSITORY_URI: {value}'.format(value=value))
+
+            # get repository owner
+            value = re.sub(r'^.*://.*/(.*)/.*$', r'\1', value)
+
+        print('NAMESPACE: {value}'.format(value=value))
+        print('##vso[task.setvariable variable=NAMESPACE]{value}'.format(value=value))
+
+  - script: |
+      # replace registry namespace
+      sed -i "s/quay.io\/dogtagpki\//quay.io\/$NAMESPACE\//g" Dockerfile
+    displayName: Update Dockerfile
+
   - script: |
       docker build \
           --build-arg BASE_IMAGE=$BASE_IMAGE \