From 95ed08d25c07ecab6d6ee62e991aef3146406b87 Mon Sep 17 00:00:00 2001
From: yoshino-s <cy-cui@outlook.com>
Date: Thu, 16 Nov 2023 09:14:12 +0000
Subject: [PATCH 1/4] =?UTF-8?q?=E5=9C=A8=20`.gitlab-ci.yml`=20=E4=B8=AD?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=AE=B9=E5=99=A8=E6=89=AB=E6=8F=8F=EF=BC=8C?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E8=AF=A5=E6=96=87=E4=BB=B6=E4=B8=8D=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E5=88=99=E5=88=9B=E5=BB=BA=E8=AF=A5=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 43 ++++++++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ca5459b..7528394 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,23 +1,36 @@
+# You can override the included template(s) by including variable overrides
+# SAST customization: https://docs.gitlab.com/ee/user/application_security/sast/#customizing-the-sast-settings
+# Secret Detection customization: https://docs.gitlab.com/ee/user/application_security/secret_detection/#customizing-settings
+# Dependency Scanning customization: https://docs.gitlab.com/ee/user/application_security/dependency_scanning/#customizing-the-dependency-scanning-settings
+# Container Scanning customization: https://docs.gitlab.com/ee/user/application_security/container_scanning/#customizing-the-container-scanning-settings
+# Note that environment variables can be set in several places
+# See https://docs.gitlab.com/ee/ci/variables/#cicd-variable-precedence
+
+# container_scanning:
+#   variables:
+#     DOCKER_IMAGE: ...
+#     DOCKER_USER: ...
+#     DOCKER_PASSWORD: ...
 stages:
-  - release
-
+- release
 variables:
-  TAGS: ""
-
+  TAGS: ''
 release-image:
   image: docker:24.0.6
   stage: release
   rules:
-    - if: '$TAGS'
+  - if: "$TAGS"
   before_script:
-    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+  - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
-    - if [ -z "$TAGS" ]; then export TAGS=$(cat tags.txt); fi
-    - |
-      for tag in $TAGS; do
-        export IMAGE_TAG=$CI_REGISTRY_IMAGE:$tag
-        echo $IMAGE_TAG
-        sed "s/latest/$tag/g" Dockerfile > Dockerfile.tmp
-        docker build . --pull -f Dockerfile.tmp -t $IMAGE_TAG
-        docker push $IMAGE_TAG
-      done
\ No newline at end of file
+  - if [ -z "$TAGS" ]; then export TAGS=$(cat tags.txt); fi
+  - |-
+    for tag in $TAGS; do
+      export IMAGE_TAG=$CI_REGISTRY_IMAGE:$tag
+      echo $IMAGE_TAG
+      sed "s/latest/$tag/g" Dockerfile > Dockerfile.tmp
+      docker build . --pull -f Dockerfile.tmp -t $IMAGE_TAG
+      docker push $IMAGE_TAG
+    done
+include:
+- template: Jobs/Container-Scanning.gitlab-ci.yml

From 639bd83262b5e421786ae8a6f573c7639b5c4e3e Mon Sep 17 00:00:00 2001
From: yoshino-s <cy-cui@outlook.com>
Date: Thu, 16 Nov 2023 09:16:39 +0000
Subject: [PATCH 2/4] Update file .gitlab-ci.yml

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7528394..e999930 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,6 +13,7 @@
 #     DOCKER_PASSWORD: ...
 stages:
 - release
+- test
 variables:
   TAGS: ''
 release-image:

From 84d2988c8226d27afde9f49c0a7ec3feaabebf34 Mon Sep 17 00:00:00 2001
From: yoshino-s <cy-cui@outlook.com>
Date: Thu, 16 Nov 2023 09:22:11 +0000
Subject: [PATCH 3/4] Update file .gitlab-ci.yml

---
 .gitlab-ci.yml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e999930..c084aa0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,23 +15,21 @@ stages:
 - release
 - test
 variables:
-  TAGS: ''
+  CI_APPLICATION_REPOSITORY: $CI_REGISTRY_IMAGE
+  CI_APPLICATION_TAG: ai-beta
 release-image:
   image: docker:24.0.6
   stage: release
   rules:
-  - if: "$TAGS"
+  - if: "$TAG"
   before_script:
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
-  - if [ -z "$TAGS" ]; then export TAGS=$(cat tags.txt); fi
   - |-
-    for tag in $TAGS; do
-      export IMAGE_TAG=$CI_REGISTRY_IMAGE:$tag
-      echo $IMAGE_TAG
-      sed "s/latest/$tag/g" Dockerfile > Dockerfile.tmp
-      docker build . --pull -f Dockerfile.tmp -t $IMAGE_TAG
-      docker push $IMAGE_TAG
-    done
+    export IMAGE_TAG=$CI_APPLICATION_REPOSITORY:$CI_APPLICATION_TAG
+    echo $IMAGE_TAG
+    sed "s/latest/$CI_APPLICATION_TAG/g" Dockerfile > Dockerfile.tmp
+    docker build . --pull -f Dockerfile.tmp -t $IMAGE_TAG
+    docker push $IMAGE_TAG
 include:
 - template: Jobs/Container-Scanning.gitlab-ci.yml

From 999f91cbfa1a40f57c87071c93551c8edd8059e2 Mon Sep 17 00:00:00 2001
From: yoshino-s <cy-cui@outlook.com>
Date: Thu, 16 Nov 2023 09:22:21 +0000
Subject: [PATCH 4/4] Update file .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c084aa0..954f880 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ release-image:
   image: docker:24.0.6
   stage: release
   rules:
-  - if: "$TAG"
+  - if: "$CI_APPLICATION_TAG"
   before_script:
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script: