Update workflows

CMCC-Foundation · Jan 26, 2024 · ee34f04 · ee34f04
1 parent 3a2aa50
commit ee34f04
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/build-push-docker.yml → .github/workflows/build-push-docker_pr.yml b/.github/workflows/build-push-docker.yml → .github/workflows/build-push-docker_pr.yml
@@ -1,4 +1,4 @@
-name: Build Docker image of the GEOKUBE component and push to the dev repository
+name: Build geokube Docker image and push to geokube container registry
 
 on:
   pull_request:
@@ -23,7 +23,7 @@ jobs:
       with:
         username: nologin
         password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: ${{ secrets.DOCKER_DEV_REPO_URL }}
+        registry: ${{ vars.GEOKUBE_REGISTRY }}
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v2        
     - name: Build and push
@@ -33,5 +33,5 @@ jobs:
         file: ./Dockerfile
         push: true
         tags: | 
-          ${{ secrets.DOCKER_DEV_REPO_URL }}/geokube:${{ env.TAG }}
-          ${{ secrets.DOCKER_DEV_REPO_URL }}/geokube:latest      
+          ${{ vars.GEOKUBE_REGISTR }}/geokube:${{ env.TAG }}
+          ${{ secrets.GEOKUBE_REGISTR }}/geokube:latest
diff --git a/.github/workflows/build-push-docker-prod.yml → ...b/workflows/build-push-docker_release.yml b/.github/workflows/build-push-docker-prod.yml → ...b/workflows/build-push-docker_release.yml
@@ -1,4 +1,4 @@
-name: Build Docker image of the GEOKUBE component and push to the production repository
+name: Build on release a geokube Docker image and push to the geokube container registry
 
 on:
   push:
@@ -18,8 +18,12 @@ jobs:
       run: pip install wheel
     - name: Build WHEEL file
       run: python setup.py bdist_wheel
-    - name: Login to Docker registry
-      run: echo ${{ secrets.DOCKER_PASSWORD }}  | docker login ${{ secrets.DOCKER_PROD_REPO_URL }} -u nologin --password-stdin      
+    - name: Login to Scaleway Container Registry
+      uses: docker/login-action@v2
+      with:
+        username: nologin
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: ${{ vars.GEOKUBE_REGISTRY }}
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v2        
     - name: Build and push
@@ -28,6 +32,5 @@ jobs:
         context: .
         file: ./Dockerfile
         push: true
-        tags: |
-           ${{ secrets.DOCKER_PROD_REPO_URL }}/geokube:${{ env.RELEASE_TAG }}      
-           ${{ secrets.DOCKER_PROD_REPO_URL }}/geokube:latest
+        tags: | 
+          ${{ vars.GEOKUBE_REGISTR }}/geokube:${{ env.TAG }}