ansible updates containers

Author: CLJ2006

ansible/deploy-ecs-proxies-retag.yml

@@ -3,20 +3,19 @@
   connection: local
   gather_facts: no
 
-
   vars:
     service_id: "{{ lookup('env','service_id') }}"
     APIGEE_ENVIRONMENT: "{{ lookup('env','APIGEE_ENVIRONMENT') }}"
     account:  "{{ lookup('env','account') }}"
 
   pre_tasks:
-    - name: Show PROXY_VARS_FILE from environment
+    - name: Show CONTAINER_VARS_FILE from environment
       debug:
-        msg: "PROXY_VARS_FILE={{ lookup('env','PROXY_VARS_FILE') }}"
+        msg: "CONTAINER_VARS_FILE={{ lookup('env','CONTAINER_VARS_FILE') }}"
 
     - name: include container vars
       include_vars:
-        file: "{{ lookup('env', 'PROXY_VARS_FILE') | expandvars | expanduser | realpath }}"
+        file: "{{ lookup('env', 'CONTAINER_VARS_FILE') | expandvars | expanduser | realpath }}"
 
     - name: Debug docker_containers
       debug:

ansible/roles/deploy-ecs-proxies-retag/tasks/main.yml

@@ -1,6 +1,6 @@
 - name: Ensure docker_containers is loaded
   include_vars:
-    file: "{{ lookup('env', 'PROXY_VARS_FILE') }}"
+    file: "{{ lookup('env', 'CONTAINER_VARS_FILE') }}"
   when: docker_containers is not defined
 
 - name: Debug docker_containers (retag role)
@@ -18,7 +18,7 @@
 - name: Debug pulling image
   debug:
     msg: "Pulling {{ ecr_registry }}/{{ item }}:{{ build_label }}"
-  with_items: "{{ repo_names }}" 
+  with_items: "{{ repo_names }}"
 
 - name: Pull existing image {{ item }}:{{ build_label }}
   ansible.builtin.command:

…e/templates/deploy-ecs-proxies-retag.yml …/components/deploy-ecs-proxies-retag.ymlazure/templates/deploy-ecs-proxies-retag.yml renamed to azure/components/deploy-ecs-proxies-retag.yml azure/templates/deploy-ecs-proxies-retag.yml renamed to azure/components/deploy-ecs-proxies-retag.yml

@@ -191,26 +191,24 @@ steps:
     displayName: Create ECS Prerequisites
     condition: and(succeeded(), eq(variables['deploy_containers'], 'true'))
 
-  - bash: |
-      set -e
+- bash: |
+    set -e
 
-      proxy_vars_file="${PROXY_VARS_FILE}"
-      echo "DEBUG: proxy_vars_file='${proxy_vars_file}'"
-      source $(SERVICE_DIR)/.build_env_vars
+    echo "DEBUG: CONTAINER_VARS_FILE='${CONTAINER_VARS_FILE}'"
+    source $(SERVICE_DIR)/.build_env_vars
 
-      export ASSUMED_VERSION=$(echo $SERVICE_ARTIFACT_NAME | grep -E -o "v[0-9]+\.[0-9]+\.[0-9]+-?[a-z]*" || true | tail -1)
-      export DEPLOYED_VERSION=${ASSUMED_VERSION:-${{ parameters.fully_qualified_service_name }}}
+    export ASSUMED_VERSION=$(echo $SERVICE_ARTIFACT_NAME | grep -E -o "v[0-9]+\.[0-9]+\.[0-9]+-?[a-z]*" || true | tail -1)
+    export DEPLOYED_VERSION=${ASSUMED_VERSION:-${{ parameters.fully_qualified_service_name }}}
       
-      account=${{ parameters.aws_account }} \
-      PROXY_VARS_FILE="${proxy_vars_file}" \
-      SOURCE_COMMIT_ID="$(Build.SourceVersion)" \
-      RELEASE_RELEASEID="$(Build.BuildId)" \
+    account=${{ parameters.aws_account }} \
+    CONTAINER_VARS_FILE="${CONTAINER_VARS_FILE}" \
+    SOURCE_COMMIT_ID="$(Build.SourceVersion)" \
+    RELEASE_RELEASEID="$(Build.BuildId)" \
+    make --no-print-directory -C $(UTILS_DIR)/ansible deploy-ecs-proxies-retag
 
+  displayName: Retag ECS image
+  condition: and(succeeded(), ne(variables['DEPLOY_ROLE'], ''))
 
-      make --no-print-directory -C $(UTILS_DIR)/ansible deploy-ecs-proxies-retag
-
-    displayName: Retag ECS image
-    condition: and(succeeded(), ne(variables['DEPLOY_ROLE'], ''))
 
   - template: ../components/aws-assume-role.yml
     parameters: