From 7dc9c21a8b4fc95a300e9363b15e18bd0dfef6c7 Mon Sep 17 00:00:00 2001
From: carbotaniuman <quy.d.x.nguyen@gmail.com>
Date: Fri, 1 Oct 2021 06:10:07 +0000
Subject: [PATCH] Ci update

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e1ee9bc..0c3765e 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,20 +1,16 @@
 stages:
   - build
   - publish
-  - publish_latest
   - publish_docker
 
 build:
   image: openjdk:8
   stage: build
-  script:
+
+  before_script:
     - export VERSION="$CI_COMMIT_REF_NAME"
+  script:
     - ./gradlew build
-    - "ls -lah build/libs"
-  cache:
-    key: "mangadex_at_home-build"
-    paths:
-      - /root/.gradle
   artifacts:
     name: "mangadex_at_home"
     paths:
@@ -23,8 +19,9 @@ build:
 publish:
   image: alpine
   stage: publish
+
   before_script:
-    - apk update && apk add git zip
+    - apk update && apk add zip
     - export VERSION="$CI_COMMIT_REF_NAME"
   script:
     - cp build/libs/mangadex_at_home-${VERSION}-all.jar ./
@@ -39,12 +36,13 @@ publish:
       - "settings.sample.yaml"
 
 publish_docker:
-  image: docker:git
+  image: docker:20.10.8
+  services:
+    - docker:20.10.8-dind
   stage: publish
   only:
     - tags
-  services:
-    - docker:dind
+
   before_script:
     - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin ${CI_REGISTRY}
     - export VERSION="$CI_COMMIT_REF_NAME"