docker: multi tag builds

.gitlab-ci.yml

@@ -1,43 +1,14 @@
-include:
+default:
-  #- local: 'ci_templates/.cic-template.yml' #kaniko build templates
+  image: docker:latest
-  # these includes are app specific unit tests
+  tags:
-  - local: 'apps/cic-eth/.gitlab-ci.yml'
+    - cic-runner
-  - local: 'apps/cic-ussd/.gitlab-ci.yml'
-  - local: 'apps/cic-notify/.gitlab-ci.yml'
-  - local: 'apps/cic-meta/.gitlab-ci.yml'
-  - local: 'apps/cic-cache/.gitlab-ci.yml'
-    #- local: 'apps/contract-migration/.gitlab-ci.yml'
-    #- local: 'apps/data-seeding/.gitlab-ci.yml'
-
-stages:
-  - build
-  - test
-  - deploy
-
-image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/docker-with-compose:latest
 
 variables:
+  REGISTRY: registry.gitlab.com/kamikazechaser/cic-monorepo
   DOCKER_BUILDKIT: "1"
-  COMPOSE_DOCKER_CLI_BUILD: "1"
-  CI_DEBUG_TRACE: "true"
 
 before_script:
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
 
-# runs on protected branches and pushes to repo
+include:
-build-push:
+  - local: 'apps/cic-eth/.gitlab-ci.yml'
-  stage: build
-  tags:
-    - integration
-  #script:
-  #  - TAG=$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA sh ./scripts/build-push.sh
-  script:
-    - TAG=latest sh ./scripts/build-push.sh
-  rules:
-  - if: $CI_COMMIT_REF_PROTECTED == "true"
-    when: always
-
-deploy-dev:
-  stage: deploy
-  trigger: grassrootseconomics/devops
-  when: manual

apps/cic-eth/.gitlab-ci.yml

@@ -1,16 +1,33 @@
-build-test-cic-eth:
+stages:
-  stage: test
+  - build-push
-  tags:
+  - test
-    - integration
+
-  variables:
+variables:
-    APP_NAME: cic-eth
+  APP_NAME: cic-eth
-    MR_IMAGE_TAG: mr-$APP_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
+
+workflow:
+  rules:
+    - changes:
+      - apps/$APP_NAME/**/*
+
+cic-eth:build-push:
+  stage: build-push
   script:
-    - cd apps/cic-eth
+    - cd apps/$APP_NAME
-    - docker build -t $MR_IMAGE_TAG -f docker/Dockerfile . 
+    - docker pull $REGISTRY/$APP_NAME:latest || true
-    - docker run $MR_IMAGE_TAG sh docker/run_tests.sh
+    - docker build --cache-from $REGISTRY/$APP_NAME:latest -t $REGISTRY/$APP_NAME:$CI_COMMIT_SHORT_SHA -f docker/Dockerfile .
+    - docker push $REGISTRY/$APP_NAME --all-tags
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "true"
+
+cic-eth:test:
+  variables:
+    GIT_STRATEGY: none
+  stage: test
+  needs: ["cic-eth:build-push"]
+  variables:
+  allow_failure: true
+  script:
+    - docker run $REGISTRY/$APP_NAME:$CI_COMMIT_SHORT_SHA sh docker/run_tests.sh
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      changes:
-          - apps/$APP_NAME/**/*
-      when: always

apps/cic-ussd/var/lib/locale/ussd.sw.yml

@@ -13,22 +13,22 @@ sw:
       CON Weka jina lako la kwanza
     enter_family_name: |-
       CON Weka jina lako la mwisho
-      0. Rudi
+      0. Nyuma
     enter_date_of_birth: |-
       CON Weka mwaka wa kuzaliwa
-      0. Rudi
+      0. Nyuma
     enter_gender: |-
       CON Weka jinsia yako
       1. Mwanaume
       2. Mwanamke
       3. Nyngine
-      0. Rudi
+      0. Nyuma
     enter_location: |-
       CON Weka eneo lako
-      0. Rudi
+      0. Nyuma
     enter_products: |-
       CON Weka bidhaa ama huduma unauza
-      0. Rudi
+      0. Nyuma
     start: |-
       CON Salio %{account_balance} %{account_token_name}
       1. Tuma
@@ -36,10 +36,10 @@ sw:
       3. Usaidizi
     enter_transaction_recipient: |-
       CON Weka nambari ya simu
-      0. Rudi
+      0. Nyuma
     enter_transaction_amount: |-
       CON Weka kiwango
-      0. Rudi
+      0. Nyuma
     account_management: |-
       CON Akaunti yangu
       1. Wasifu wangu
@@ -47,7 +47,7 @@ sw:
       3. Angalia salio
       4. Angalia taarifa ya matumizi
       5. Badilisha nambari ya siri
-      0. Rudi
+      0. Nyuma
     metadata_management: |-
       CON Wasifu wangu
       1. Weka jina
@@ -56,7 +56,7 @@ sw:
       4. Weka eneo
       5. Weka bidhaa
       6. Angalia wasifu wako
-      0. Rudi
+      0. Nyuma
     display_user_metadata: |-
       CON Wasifu wako una maelezo yafuatayo:
         Jina: %{full_name}
@@ -64,98 +64,98 @@ sw:
         Umri: %{age}
         Eneo: %{location}
         Unauza: %{products}
-      0. Rudi
+      0. Nyuma
     select_preferred_language: |-
       CON Chagua lugha
       1. Kingereza
       2. Kiswahili
-      0. Rudi
+      0. Nyuma
     retry_pin_entry: |-
       CON Nambari uliyoweka si sahihi, jaribu tena. Una majaribio %{remaining_attempts} yaliyobaki.
       0. Back
     enter_current_pin:
       first: |-
         CON Weka nambari ya siri.
-        0. Rudi
+        0. Nyuma
       retry: |-
         %{retry_pin_entry}
     enter_new_pin: |-
       CON Weka nambari ya siri mpya
-      0. Rudi
+      0. Nyuma
     new_pin_confirmation: |-
       CON Weka nambari yako ya siri tena
-      0. Rudi
+      0. Nyuma
     transaction_pin_authorization:
       first: |-
         CON %{recipient_information} atapokea %{transaction_amount} %{token_symbol} kutoka kwa %{sender_information}.
         Tafadhali weka nambari yako ya siri kudhibitisha.
-        0. Rudi
+        0. Nyuma
       retry: |-
         %{retry_pin_entry}
     display_metadata_pin_authorization:
       first: |-
         CON Tafadhali weka PIN yako
-        0. Rudi
+        0. Nyuma
       retry: |-
         %{retry_pin_entry}
     account_balances_pin_authorization:
       first: |-
         CON Tafadhali weka PIN yako kuona salio.
-        0. Rudi
+        0. Nyuma
       retry: |-
         %{retry_pin_entry}
     account_statement_pin_authorization:
       first: |-
         CON Tafadhali weka PIN yako kuona taarifa ya matumizi.
-        0. Rudi
+        0. Nyuma
       retry: |-
         %{retry_pin_entry}
     name_edit_pin_authorization:
       first: |-
         CON Tafadhali weka PIN yako
-        0. Rudi
+        0. Nyuma
       retry: |-
         %{retry_pin_entry}
     dob_edit_pin_authorization:
       first: |-
         CON Tafadhali weka PIN yako
-        0. Rudi
+        0. Nyuma
       retry: |-
         %{retry_pin_entry}
     gender_edit_pin_authorization:
       first: |-
         CON Tafadhali weka PIN yako
-        0. Rudi
+        0. Nyuma
       retry: |-
         %{retry_pin_entry}
     location_edit_pin_authorization:
       first: |-
         CON Tafadhali weka PIN yako
-        0. Rudi
+        0. Nyuma
       retry: |-
         %{retry_pin_entry}
     products_edit_pin_authorization:
       first: |-
         CON Tafadhali weka PIN yako
-        0. Rudi
+        0. Nyuma
       retry: |-
         %{retry_pin_entry}
     account_balances:
       available_balance: |-
         CON Salio zako ni zifuatazo:
           salio: %{available_balance} %{token_symbol}
-        0. Rudi
+        0. Nyuma
       with_fees: |-
         CON Salio zako ni zifuatazo:
           salio: %{available_balance} %{token_symbol}
           ushuru: %{tax} %{token_symbol}
-        0. Rudi
+        0. Nyuma
       with_rewards: |-
         CON Salio zako ni zifuatazo:
           salio: %{available_balance} %{token_symbol}
           ushuru: %{tax} %{token_symbol}
           tuzo: %{bonus} %{token_symbol}
-        0. Rudi
+        0. Nyuma
     first_transaction_set: |-
       CON %{first_transaction_set}
       1. Mbele
@@ -163,54 +163,54 @@ sw:
     middle_transaction_set: |-
       CON %{middle_transaction_set}
       1. Mbele
-      2. Rudi
+      2. Nyuma
       00. Ondoka
     last_transaction_set: |-
       CON %{last_transaction_set}
-      2. Rudi
+      2. Nyuma
       00. Ondoka
     exit: |-
-      END Asante kwa kutumia huduma
+      END Asante kwa kutumia huduma.
     exit_invalid_request: |-
       END Chaguo si sahihi.
     exit_invalid_menu_option: |-
       CON Chaguo lako sio sahihi. Kwa usaidizi piga simu %{support_phone}
-      00. Rudi
+      00. Nyuma
       99. Ondoka
     exit_invalid_input: |-
-      CON Chaguo lako halipatikani. Hakuna kilichochaguliwa
+      CON Chaguo lako halipatikani. Hakuna kilichochaguliwa.
-      00. Rudi
+      00. Nyuma
       99. Ondoka
     exit_pin_blocked: |-
-      END PIN yako imefungwa. Kwa usaidizi tafadhali piga simu %{support_phone}
+      END PIN yako imefungwa. Kwa usaidizi tafadhali piga simu %{support_phone}.
     exit_invalid_pin: |-
-      END PIN uliyobonyeza sio sahihi. PIN lazima iwe na nambari nne. Kwa usaidizi piga simu %{support_phone}
+      END PIN uliyobonyeza sio sahihi. PIN lazima iwe na nambari nne. Kwa usaidizi piga simu %{support_phone}.
     exit_invalid_new_pin: |-
-      END PIN uliyobonyeza sio sahihi. PIN lazima iwe tofauti na pin yako ya sasa. Kwa usaidizi piga simu %{support_phone}
+      END PIN uliyobonyeza sio sahihi. PIN lazima iwe tofauti na pin yako ya sasa. Kwa usaidizi piga simu %{support_phone}.
     exit_pin_mismatch: |-
-      END PIN mpya na udhibitisho wa pin mpya hazilingani. Tafadhali jaribu tena. Kwa usaidizi piga simu %{support_phone}
+      END PIN mpya na udhibitisho wa pin mpya hazilingani. Tafadhali jaribu tena. Kwa usaidizi piga simu %{support_phone}.
     exit_invalid_recipient: |-
       CON Mpokeaji wa nambari hapatikani au sio sahihi.
       00. Jaribu tena
       99. Ondoka
     exit_successful_transaction: |-
-      CON Ombi lako limetumwa. %{recipient_information} atapokea %{transaction_amount} %{token_symbol} kutoka kwa %{sender_information}
+      CON Ombi lako limetumwa. %{recipient_information} atapokea %{transaction_amount} %{token_symbol} kutoka kwa %{sender_information}.
-      00. Rudi
+      00. Nyuma
       99. Ondoka
     exit_insufficient_balance: |-
-      CON Malipo ya %{amount} %{token_symbol} kwa %{recipient_information} halijakamilika kwa sababu salio lako haitoshi
+      CON Malipo ya %{amount} %{token_symbol} kwa %{recipient_information} halijakamilika kwa sababu salio lako haitoshi.
       Akaunti yako ya Sarafu ina salio ifuatayo: %{token_balance}
-      00. Rudi
+      00. Nyuma
       99. Ondoka
     invalid_service_code: |-
       Bonyeza %{valid_service_code} kutumia mtandao wa Sarafu
     help: |-
       CON Kwa usaidizi piga simu %{support_phone}
-      0. Rudi
+      0. Nyuma
       9. Ondoka
     complete: |-
       CON Ombi lako limetumwa. Utapokea uthibitishaji wa SMS kwa muda mfupi.
-      00. Rudi
+      00. Nyuma
       99. Ondoka
     account_creation_prompt: |-
       END Akaunti yako ya Sarafu inatayarishwa. Utapokea ujumbe wa SMS akaunti yako ikiwa tayari.