From ca8247d91d99ab916b3d3a6142a6dbcd7afc9e98 Mon Sep 17 00:00:00 2001
From: Yoshino-s <yoshino.prog@gmail.com>
Date: Tue, 6 Jun 2023 11:04:21 +0800
Subject: [PATCH] feat: dind

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f98c595..46f256a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,29 +13,33 @@ generate:
     - pip install -r requirements.txt
     - ./update.py > tags.txt
   artifacts:
+    expire_in: 1 hour
     paths:
       - tags.txt
 
 
 build:
-  stage: build
   needs:
     - job: generate
       artifacts: true
+  image: docker:latest
+  stage: build
+  services:
+    - docker:dind
   variables:
-    KANIKO_ARGS: "--cache=true --cache-repo $CI_REGISTRY_IMAGE --cache-ttl $CACHE_TTL"
-    KANIKO_BUILD_CONTEXT: $CI_PROJECT_DIR
-  image:
-    name: gcr.io/kaniko-project/executor:debug
-    entrypoint: [""]
+    DOCKER_HOST: tcp://docker:2376
+    DOCKER_TLS_CERTDIR: "/certs"
+    DOCKER_TLS_VERIFY: 1
+    DOCKER_CERT_PATH: "$DOCKER_TLS_CERTDIR/client"
+  before_script:
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+    - docker info
   script:
-    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(echo -n ${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD} | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json
-    - mkdir -p /kaniko/.docker
     - |
       for tag in $(cat tags.txt); do
         export IMAGE_TAG=$CI_REGISTRY_IMAGE:$tag
         echo $IMAGE_TAG
-        DOCKERFILE_PATH=$KANIKO_BUILD_CONTEXT/Dockerfile
-        sed "s/latest/$tag/g" $DOCKERFILE_PATH > $DOCKERFILE_PATH.tmp
-        /kaniko/executor --context $KANIKO_BUILD_CONTEXT --dockerfile $DOCKERFILE_PATH.tmp --destination $IMAGE_TAG $KANIKO_ARGS
+        sed "s/latest/$tag/g" Dockerfile > Dockerfile.tmp
+        docker build . --pull -f Dockerfile.tmp -t $IMAGE_TAG
+        docker push $IMAGE_TAG
       done