From 54a1e27e54a0014bf6e43534be6577ae05f26b46 Mon Sep 17 00:00:00 2001
From: Taken <taken@mairimashita.org>
Date: Sat, 21 Sep 2024 21:07:56 +0000
Subject: [PATCH] Update .gitlab-ci.yml file

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 840f147..f0dadbe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,18 @@
-docker-build:
+merge:
+  image: docker:cli
+  stage: test
+  services:
+    - docker:dind
+  variables:
+    DOCKER_IMAGE_NAME: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+  script:
+    - |
+        docker build . -f Dockerfile.cache -t node-cache
+        docker build -t "$DOCKER_IMAGE_NAME" .
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+
+build:
   image: docker:cli
   stage: build
   services:
@@ -8,14 +22,10 @@ docker-build:
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
-    - docker build . -f Dockerfile.cache -t node-cache
-    - docker build -t "$DOCKER_IMAGE_NAME" .
     - |
-      if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
+        docker build . -f Dockerfile.cache -t node-cache
+        docker build -t "$DOCKER_IMAGE_NAME" .
         docker tag "$DOCKER_IMAGE_NAME" "$CI_REGISTRY_IMAGE:main"
         docker push "$CI_REGISTRY_IMAGE:main"
-      fi
   rules:
-    - if: $CI_COMMIT_BRANCH
-      exists:
-        - Dockerfile
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
\ No newline at end of file