only use cr prod for app image too

StackEng · Jul 16, 2024 · 495676f · 495676f
1 parent e6f0307
commit 495676f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/.github/actions/build_docker/action.yml b/.github/actions/build_docker/action.yml
@@ -11,9 +11,6 @@ inputs:
   image_name:
     description: The Docker image name, with the registry prefix
     required: true
-  registry_dev:
-    description: Docker registry dev
-    required: true
   registry_prod:
     description: Docker registry prod
     required: true
@@ -49,13 +46,6 @@ runs:
           ${{ github.ref_name == 'main' && '' || format('pr-{0}', github.event.pull_request.number) }}
         flavor: latest=false
 
-    - name: Login to Docker Registry - dev
-      uses: docker/login-action@v3
-      with:
-        registry: ${{ inputs.registry_dev }}
-        username: ${{ inputs.registry_username }}
-        password: ${{ inputs.registry_password }}
-
     - name: Login to Docker Registry - prod
       uses: docker/login-action@v3
       with:

diff --git a/.github/workflows/build_app_docker_image.yml b/.github/workflows/build_app_docker_image.yml
@@ -18,7 +18,7 @@ on:
 
 env:
     BUILDKIT_PROGRESS: plain
-    SERVICE_IMAGE_NAME: ${{ github.ref_name == 'main' && vars.CLOUDSMITH_DOCKER_REGISTRY_PROD || vars.CLOUDSMITH_DOCKER_REGISTRY_DEV }}/stackeng/opserver/opserver
+    SERVICE_IMAGE_NAME: ${{ vars.CLOUDSMITH_DOCKER_REGISTRY_PROD }}/stackeng/opserver/opserver
 
 jobs:
   build_docker:
@@ -36,7 +36,6 @@ jobs:
         version: ${{ inputs.version }}
         dockerfile_path: ./Dockerfile
         image_name: ${{ env.SERVICE_IMAGE_NAME }}
-        registry_dev: ${{ vars.CLOUDSMITH_DOCKER_REGISTRY_DEV }}
         registry_prod: ${{ vars.CLOUDSMITH_DOCKER_REGISTRY_PROD }}
         registry_username: ${{ secrets.registry_username }}
         registry_password: ${{ secrets.registry_password }}        

diff --git a/.github/workflows/build_cnab.yml b/.github/workflows/build_cnab.yml
@@ -31,7 +31,6 @@ jobs:
         version: ${{ inputs.version }}
         dockerfile_path: ./cnab/build/Dockerfile
         image_name: ${{ env.CNAB_IMAGE_NAME }}
-        registry_dev: ${{ vars.CLOUDSMITH_DOCKER_REGISTRY_DEV }}
         registry_prod: ${{ vars.CLOUDSMITH_DOCKER_REGISTRY_PROD }}
         registry_username: ${{ secrets.registry_username }}
         registry_password: ${{ secrets.registry_password }}