Merge pull request krestomatio#74 from krestomatio/develop

chore(graphql-engine): update version
svenska-primekey · Sep 10, 2021 · a98b42b · a98b42b
2 parents 792bf37 + f3fc63e
commit a98b42b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 15 deletions.
diff --git a/.ansible-ci/files/templated_contexts/graphql-engine/Dockerfile.j2 b/.ansible-ci/files/templated_contexts/graphql-engine/Dockerfile.j2
@@ -30,9 +30,9 @@ RUN git clone -b v${GRAPHQL_ENGINE_VERSION} https://github.com/hasura/graphql-en
 
 WORKDIR /repo/graphql-engine
 
-ARG GHC_OPTION_MEMORY \
-    GHC_OPTION_OPTIMIZATION \
-    GHC_OPTION_NUM_JOBS
+ARG GHC_OPTION_MEMORY
+ARG GHC_OPTION_OPTIMIZATION
+ARG GHC_OPTION_NUM_JOBS
 
 ENV GHC_OPTION_MEMORY=${GHC_OPTION_MEMORY:-15000m} \
     GHC_OPTION_OPTIMIZATION=${GHC_OPTION_OPTIMIZATION:-1} \

diff --git a/.ansible-ci/inventory/group_vars/graphql_engine/dockerfile_builder.yml b/.ansible-ci/inventory/group_vars/graphql_engine/dockerfile_builder.yml
@@ -1,4 +1,4 @@
-graphql_engine_version: 2.0.7
+graphql_engine_version: 2.0.9
 postgres_major_version: 13
 
 # source dir

diff --git a/.ansible-ci/inventory/host_vars/graphql-engine-build/dockerfile_builder.yml b/.ansible-ci/inventory/host_vars/graphql-engine-build/dockerfile_builder.yml
@@ -1,2 +1,5 @@
+tag_alternative_image_name: "{{ container_image }}"
+dockerfile_builder_tags:
+  - "{{ graphql_engine_version }}"
 dockerfile_builder_build_omit: "{{ false if load_state_yml_tag is not defined else
   (true if load_state_yml_tag | regex_search(external_release_version_regex) == graphql_engine_version else false) }}"
diff --git a/.ansible-ci/tasks/builder/tag.yml b/.ansible-ci/tasks/builder/tag.yml
@@ -17,17 +17,24 @@
   changed_when: false
   shell: |
     tags=( "{{ dockerfile_builder_tags | join('" "')}}" )
-    for tag in "${tags[@]}"
-    do
-      {{ dockerfile_builder }} tag {{ container_image }} {{ build_image_name | default(container_image) }}:${tag}
-      exit_code=$?
-      if ! [ $exit_code -eq 0 ]
-      then
-        echo "TAG: '${tag}'...not added"
-      else
-        echo "TAG: '${tag}'...added"
-      fi
-    done
+    add_tags () {
+      echo "TAGGING: '$1'"
+      for tag in "${tags[@]}"
+      do
+        {{ dockerfile_builder }} tag {{ container_image }} $1:${tag}
+        exit_code=$?
+        if ! [ $exit_code -eq 0 ]
+        then
+          echo "TAG: '${tag}'...not added"
+        else
+          echo "TAG: '${tag}'...added"
+        fi
+      done
+    }
+    add_tags {{ build_image_name | default(container_image) }}
+    {% if tag_alternative_image_name is defined and tag_alternative_image_name and tag_alternative_image_name != build_image_name | default(container_image) %}
+    add_tags {{ tag_alternative_image_name }}
+    {% endif %}
 
 - name: show tagging output
   when: tag_image_task.stdout_lines is defined