From 7d4f91a15fec344a2e32b9b770e7796628070d40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Szyma=C5=84ski?= Date: Mon, 27 Nov 2023 16:21:13 +0100 Subject: [PATCH 1/2] Added new variable which specifies which container should be deployed --- .github/workflows/run-validation.yml | 14 +++++++++++++- action.yml | 7 ++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-validation.yml b/.github/workflows/run-validation.yml index efb5b534..c4b8dcf9 100644 --- a/.github/workflows/run-validation.yml +++ b/.github/workflows/run-validation.yml @@ -53,6 +53,7 @@ jobs: resourceGroup: ${{ vars.TEST_RESOURCE_GROUP_NAME }} imageToBuild: ${{ env.TEST_FULL_ACR_NAME }}/${{ env.TEST_IMAGE_REPOSITORY }}:${{ env.TEST_IMAGE_TAG }} disableTelemetry: ${{ vars.TEST_DISABLE_TELEMETRY }} + containerName: ${{ vars.CONTAINER_NAME }} - name: Delete created Azure Container App if: ${{ always() }} @@ -100,6 +101,7 @@ jobs: resourceGroup: ${{ vars.TEST_RESOURCE_GROUP_NAME }} imageToBuild: ${{ env.TEST_FULL_ACR_NAME }}/${{ env.TEST_IMAGE_REPOSITORY }}:${{ env.TEST_IMAGE_TAG }} disableTelemetry: ${{ vars.TEST_DISABLE_TELEMETRY }} + containerName: ${{ vars.CONTAINER_NAME }} - name: Delete created Azure Container App if: ${{ always() }} @@ -148,6 +150,7 @@ jobs: resourceGroup: ${{ vars.TEST_RESOURCE_GROUP_NAME }} imageToBuild: ${{ env.TEST_FULL_ACR_NAME }}/${{ env.TEST_IMAGE_REPOSITORY }}:${{ env.TEST_IMAGE_TAG }} disableTelemetry: ${{ vars.TEST_DISABLE_TELEMETRY }} + containerName: ${{ vars.CONTAINER_NAME }} - name: Delete created Azure Container App if: ${{ always() }} @@ -185,6 +188,7 @@ jobs: containerAppEnvironment: ${{ vars.TEST_EXISTING_CONTAINER_APP_ENV }} resourceGroup: ${{ vars.TEST_RESOURCE_GROUP_NAME }} disableTelemetry: ${{ vars.TEST_DISABLE_TELEMETRY }} + containerName: ${{ vars.CONTAINER_NAME }} - name: Delete created Azure Container App if: ${{ always() }} @@ -217,6 +221,7 @@ jobs: containerAppEnvironment: ${{ vars.TEST_EXISTING_CONTAINER_APP_ENV }} resourceGroup: ${{ vars.TEST_RESOURCE_GROUP_NAME }} disableTelemetry: ${{ vars.TEST_DISABLE_TELEMETRY }} + containerName: ${{ vars.CONTAINER_NAME }} - name: Delete created Azure Container App if: ${{ always() }} @@ -250,6 +255,7 @@ jobs: containerAppEnvironment: ${{ env.TEST_NEW_CONTAINER_APP_ENV }} resourceGroup: ${{ vars.TEST_RESOURCE_GROUP_NAME }} disableTelemetry: ${{ vars.TEST_DISABLE_TELEMETRY }} + containerName: ${{ vars.CONTAINER_NAME }} - name: Delete created Azure Container App if: ${{ always() }} @@ -329,6 +335,7 @@ jobs: resourceGroup: ${{ vars.TEST_RESOURCE_GROUP_NAME }} imageToBuild: ${{ env.TEST_FULL_ACR_NAME }}/${{ env.TEST_IMAGE_REPOSITORY }}:${{ env.TEST_IMAGE_TAG }} disableTelemetry: ${{ vars.TEST_DISABLE_TELEMETRY }} + containerName: ${{ vars.CONTAINER_NAME }} - name: Delete created Azure Container App if: ${{ always() }} @@ -378,6 +385,7 @@ jobs: containerAppName: ${{ env.TEST_CONTAINER_APP_NAME }} resourceGroup: ${{ vars.TEST_RESOURCE_GROUP_NAME }} disableTelemetry: ${{ vars.TEST_DISABLE_TELEMETRY }} + containerName: ${{ vars.CONTAINER_NAME }} - name: Delete created Azure Container App if: ${{ always() }} @@ -422,6 +430,7 @@ jobs: containerAppName: ${{ env.TEST_CONTAINER_APP_NAME }} resourceGroup: ${{ vars.TEST_RESOURCE_GROUP_NAME }} disableTelemetry: ${{ vars.TEST_DISABLE_TELEMETRY }} + containerName: ${{ vars.CONTAINER_NAME }} - name: Delete created Azure Container App if: ${{ always() }} @@ -464,6 +473,7 @@ jobs: resourceGroup: ${{ vars.TEST_RESOURCE_GROUP_NAME }} imageToBuild: ${{ env.TEST_FULL_ACR_NAME }}/${{ env.TEST_IMAGE_REPOSITORY }}:${{ env.TEST_IMAGE_TAG }} disableTelemetry: ${{ vars.TEST_DISABLE_TELEMETRY }} + containerName: ${{ vars.CONTAINER_NAME }} - name: Delete pushed image if: ${{ always() }} @@ -501,6 +511,7 @@ jobs: containerAppEnvironment: ${{ vars.TEST_EXISTING_CONTAINER_APP_ENV }} resourceGroup: ${{ vars.TEST_RESOURCE_GROUP_NAME }} disableTelemetry: ${{ vars.TEST_DISABLE_TELEMETRY }} + containerName: ${{ vars.CONTAINER_NAME }} update-using-image-yaml: @@ -534,4 +545,5 @@ jobs: yamlConfigPath: ${{ env.TEST_YAML_FILE_PATH }} containerAppName: ${{ env.TEST_CONTAINER_APP_NAME }} resourceGroup: ${{ vars.TEST_RESOURCE_GROUP_NAME }} - disableTelemetry: ${{ vars.TEST_DISABLE_TELEMETRY }} \ No newline at end of file + disableTelemetry: ${{ vars.TEST_DISABLE_TELEMETRY }} + containerName: ${{ vars.CONTAINER_NAME }} \ No newline at end of file diff --git a/action.yml b/action.yml index cdff7e70..e7bc63d8 100644 --- a/action.yml +++ b/action.yml @@ -132,7 +132,10 @@ inputs: this GitHub Action.' required: false default: false - + containerName: + descritpion: | + 'Container name to deploy.' + required: false runs: using: "composite" steps: @@ -614,6 +617,7 @@ runs: -g ${{ env.CA_GH_ACTION_RESOURCE_GROUP }} \ -n ${{ inputs.containerAppName }} \ --yaml ${{ inputs.yamlConfigPath }} \ + --container-name ${{ inputs.containerName }} \ --output none - name: Determine whether or not 'update' or 'up' should be used @@ -643,6 +647,7 @@ runs: -n ${{ inputs.containerAppName }} \ -i ${{ env.CA_GH_ACTION_IMAGE_TO_DEPLOY }} \ ${{ env.CA_GH_ACTION_CONTAINER_APP_ENVIRONMENT_VARIABLES_ARG }} \ + --container-name ${{ inputs.containerName }} \ --output none - name: Reset the ingress argument environment variable if it wasn't provided (use default ingress value) From 609ecb3c0ed5378767d1bc5e9767cc955c4976f9 Mon Sep 17 00:00:00 2001 From: jkszymans <52679269+jkszymans@users.noreply.github.com> Date: Fri, 2 Aug 2024 11:18:43 +0200 Subject: [PATCH 2/2] fix typo --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index e7bc63d8..3294e29b 100644 --- a/action.yml +++ b/action.yml @@ -133,7 +133,7 @@ inputs: required: false default: false containerName: - descritpion: | + description: | 'Container name to deploy.' required: false runs: