chore(all): clean

guillaume-chervet · Oct 23, 2024 · 460b018 · 460b018
1 parent 67c973b
commit 460b018
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -21,6 +21,9 @@ on:
       docker_registry:
         required: true
         type: string
+      docker_repository:
+        required: true
+        type: string
     secrets:
       DOCKER_USERNAME:
         required: true
@@ -57,7 +60,7 @@ jobs:
         file : ${{ inputs.image_file }}
         build-args: ${{ inputs.image_build_args }}
         push: true
-        tags: ${{ inputs.docker_registry }}/${{ inputs.image_name }}:latest,${{ inputs.docker_registry }}/${{ inputs.image_name }}:${{ inputs.image_version }}
+        tags: ${{ inputs.docker_registry }}/${{ inputs.docker_repository }}/${{ inputs.image_name }}:latest,${{ inputs.docker_registry }}/${{ inputs.docker_repository }}/${{ inputs.image_name }}:${{ inputs.image_version }}
         labels: ${{ steps.meta.outputs.labels }}
 
     - name: Build and push Docker image
@@ -68,6 +71,6 @@ jobs:
         file : ${{ inputs.image_file }}
         build-args: ${{ inputs.image_build_args }}
         push: true
-        tags: ${{ inputs.docker_registry }}/${{ inputs.image_name }}:${{ inputs.image_version }}
+        tags: ${{ inputs.docker_registry }}/${{ inputs.docker_repository }}/${{ inputs.image_name }}:${{ inputs.image_version }}
         labels: ${{ steps.meta.outputs.labels }}
 
diff --git a/.github/workflows/docker_with_model.yml b/.github/workflows/docker_with_model.yml
@@ -33,6 +33,9 @@ on:
       docker_registry:
         required: true
         type: string
+      docker_repository:
+        required: true
+        type: string
     secrets:
       DOCKER_USERNAME:
         required: true
@@ -126,7 +129,7 @@ jobs:
         file : ${{ inputs.image_file }}
         build-args: ${{ inputs.image_build_args }}
         push: true
-        tags: ${{ inputs.docker_registry }}/${{ inputs.image_name }}:latest,${{ inputs.docker_registry }}/${{ inputs.image_name }}:${{ inputs.image_version }}
+        tags: ${{ inputs.docker_registry }}/${{ inputs.docker_repository }}/${{ inputs.image_name }}:latest,${{ inputs.docker_registry }}/${{ inputs.docker_repository }}/${{ inputs.image_name }}:${{ inputs.image_version }}
         labels: ${{ steps.meta.outputs.labels }}
 
     - name: Build and push Docker image
@@ -137,6 +140,6 @@ jobs:
         file : ${{ inputs.image_file }}
         build-args: ${{ inputs.image_build_args }}
         push: true
-        tags: ${{ inputs.docker_registry }}/${{ inputs.image_name }}:${{ inputs.image_version }}
+        tags: ${{ inputs.docker_registry }}/${{ inputs.docker_repository }}/${{ inputs.image_name }}:${{ inputs.image_version }}
         labels: ${{ steps.meta.outputs.labels }}
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -283,7 +283,7 @@ jobs:
     - name: Deploy container
       run: |
         # https://learn.microsoft.com/en-us/cli/azure/container?view=azure-cli-latest#az-container-create()
-        az container create --resource-group ${{ env.AZURE_RESOURCE_GROUP_NAME}} --name ${{ env.AZURE_WEBAPP_NAME }} --dns-name-label ${{ env.AZURE_WEBAPP_NAME }} --image ${{ env.DOCKER_REGISTRY }}/${{ env.DOCKER_REPOSITORY }}/${{ env.DOCKER_API_IMAGE_NAME }}:${{ needs.tags.outputs.new_version }} --ports 5000
+        az container create --resource-group ${{ env.AZURE_RESOURCE_GROUP_NAME}} --name ${{ env.AZURE_WEBAPP_NAME }} --dns-name-label ${{ env.AZURE_WEBAPP_NAME }} --image ${{ env.DOCKER_REGISTRY }}/${{ needs.train.outputs.DOCKER_REPOSITORY }}/${{ env.DOCKER_API_IMAGE_NAME }}:${{ needs.tags.outputs.new_version }} --ports 5000
   integration_tests:
     environment: MLOpsPython
     runs-on: ubuntu-latest