From dd71a0d3c2ad66d28b26841fbdfc0e6283317869 Mon Sep 17 00:00:00 2001 From: Aleksandr Kurlov Date: Mon, 6 May 2024 07:03:39 +0200 Subject: [PATCH 1/2] Add email sender to build and push --- build_push_app_interface.sh | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/build_push_app_interface.sh b/build_push_app_interface.sh index e43a690986..d659a622ad 100755 --- a/build_push_app_interface.sh +++ b/build_push_app_interface.sh @@ -34,6 +34,7 @@ # Set image repository to default value if it is not passed via env IMAGE_REPOSITORY="${QUAY_IMAGE_REPOSITORY:-app-sre/acs-fleet-manager}" PROBE_IMAGE_REPOSITORY="${PROBE_QUAY_IMAGE_REPOSITORY:-app-sre/acscs-probe}" +EMAIL_SENDER_IMAGE_REPOSITORY="${PROBE_QUAY_IMAGE_REPOSITORY:-app-sre/acs-emailsender}" source ./scripts/build_setup.sh @@ -80,3 +81,24 @@ make \ probe_image_repository="${PROBE_IMAGE_REPOSITORY}" \ docker/login/probe \ image/push/probe + +make \ + DOCKER_CONFIG="${DOCKER_CONFIG}" \ + QUAY_PROBE_USER="${QUAY_USER}" \ + QUAY_PROBE_TOKEN="${QUAY_TOKEN}" \ + external_image_registry="quay.io" \ + internal_image_registry="quay.io" \ + probe_image_repository="${EMAIL_SENDER_IMAGE_REPOSITORY}" \ + docker/login/fleet-manager \ + image/push/emailsender + +make \ + DOCKER_CONFIG="${DOCKER_CONFIG}" \ + QUAY_PROBE_USER="${QUAY_USER}" \ + QUAY_PROBE_TOKEN="${QUAY_TOKEN}" \ + TAG="main" \ + external_image_registry="quay.io" \ + internal_image_registry="quay.io" \ + probe_image_repository="${EMAIL_SENDER_IMAGE_REPOSITORY}" \ + docker/login/fleet-manager \ + image/push/emailsender From 3d16ee69d2a915491750c1b162df5cadc3eb555b Mon Sep 17 00:00:00 2001 From: Aleksandr Kurlov Date: Mon, 6 May 2024 07:06:01 +0200 Subject: [PATCH 2/2] Fix --- build_push_app_interface.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build_push_app_interface.sh b/build_push_app_interface.sh index d659a622ad..863b31d6c0 100755 --- a/build_push_app_interface.sh +++ b/build_push_app_interface.sh @@ -34,7 +34,7 @@ # Set image repository to default value if it is not passed via env IMAGE_REPOSITORY="${QUAY_IMAGE_REPOSITORY:-app-sre/acs-fleet-manager}" PROBE_IMAGE_REPOSITORY="${PROBE_QUAY_IMAGE_REPOSITORY:-app-sre/acscs-probe}" -EMAIL_SENDER_IMAGE_REPOSITORY="${PROBE_QUAY_IMAGE_REPOSITORY:-app-sre/acs-emailsender}" +EMAILSENDER_IMAGE_REPOSITORY="${QUAY_IMAGE_REPOSITORY:-app-sre/acs-emailsender}" source ./scripts/build_setup.sh @@ -84,21 +84,21 @@ make \ make \ DOCKER_CONFIG="${DOCKER_CONFIG}" \ - QUAY_PROBE_USER="${QUAY_USER}" \ - QUAY_PROBE_TOKEN="${QUAY_TOKEN}" \ + QUAY_USER="${QUAY_USER}" \ + QUAY_TOKEN="${QUAY_TOKEN}" \ external_image_registry="quay.io" \ internal_image_registry="quay.io" \ - probe_image_repository="${EMAIL_SENDER_IMAGE_REPOSITORY}" \ + emailsender_image_repository="${EMAILSENDER_IMAGE_REPOSITORY}" \ docker/login/fleet-manager \ image/push/emailsender make \ DOCKER_CONFIG="${DOCKER_CONFIG}" \ - QUAY_PROBE_USER="${QUAY_USER}" \ - QUAY_PROBE_TOKEN="${QUAY_TOKEN}" \ + QUAY_USER="${QUAY_USER}" \ + QUAY_TOKEN="${QUAY_TOKEN}" \ TAG="main" \ external_image_registry="quay.io" \ internal_image_registry="quay.io" \ - probe_image_repository="${EMAIL_SENDER_IMAGE_REPOSITORY}" \ + emailsender_image_repository="${EMAILSENDER_IMAGE_REPOSITORY}" \ docker/login/fleet-manager \ image/push/emailsender