From a28f0c46c57108fd5f4ce267e975211fab628139 Mon Sep 17 00:00:00 2001
From: carbotaniuman <quy.d.x.nguyen@gmail.com>
Date: Thu, 30 Sep 2021 23:58:53 -0500
Subject: [PATCH 1/7] Update CI a bit

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e1ee9bc..1a429dc 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,6 @@ build:
   script:
     - export VERSION="$CI_COMMIT_REF_NAME"
     - ./gradlew build
-    - "ls -lah build/libs"
   cache:
     key: "mangadex_at_home-build"
     paths:
@@ -21,12 +20,11 @@ build:
       - "build/libs/mangadex_at_home-*-all.jar"
 
 publish:
-  image: alpine
+  image: alpine/git
   stage: publish
-  before_script:
-    - apk update && apk add git zip
-    - export VERSION="$CI_COMMIT_REF_NAME"
+
   script:
+    - export VERSION="$CI_COMMIT_REF_NAME"
     - cp build/libs/mangadex_at_home-${VERSION}-all.jar ./
     - zip -r9 mangadex_at_home-${VERSION}.zip mangadex_at_home-${VERSION}-all.jar settings.sample.yaml
   dependencies:
@@ -39,18 +37,19 @@ publish:
       - "settings.sample.yaml"
 
 publish_docker:
-  image: docker:git
+  image: docker:20.10.8-git
+  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"
   dependencies:
     - build
   script:
+    - export VERSION="$CI_COMMIT_REF_NAME"
     - mv build/libs/mangadex_at_home-${VERSION}-all.jar build/libs/mangadex_at_home.jar
     - docker build . -t ${CI_REGISTRY_IMAGE}:${VERSION}
     - docker push ${CI_REGISTRY_IMAGE}:${VERSION}

From 4bb4a390c4570ec0538683d83c6ffaa1c34ba5a3 Mon Sep 17 00:00:00 2001
From: carbotaniuman <quy.d.x.nguyen@gmail.com>
Date: Fri, 1 Oct 2021 00:07:22 -0500
Subject: [PATCH 2/7] Further updates

---
 .gitlab-ci.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1a429dc..a67eb57 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,13 +7,11 @@ stages:
 build:
   image: openjdk:8
   stage: build
-  script:
+
+  before_script:
     - export VERSION="$CI_COMMIT_REF_NAME"
+  script:
     - ./gradlew build
-  cache:
-    key: "mangadex_at_home-build"
-    paths:
-      - /root/.gradle
   artifacts:
     name: "mangadex_at_home"
     paths:
@@ -23,8 +21,9 @@ publish:
   image: alpine/git
   stage: publish
 
-  script:
+  before_script:
     - export VERSION="$CI_COMMIT_REF_NAME"
+  script:
     - cp build/libs/mangadex_at_home-${VERSION}-all.jar ./
     - zip -r9 mangadex_at_home-${VERSION}.zip mangadex_at_home-${VERSION}-all.jar settings.sample.yaml
   dependencies:
@@ -46,10 +45,10 @@ publish_docker:
 
   before_script:
     - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin ${CI_REGISTRY}
+    - export VERSION="$CI_COMMIT_REF_NAME"
   dependencies:
     - build
   script:
-    - export VERSION="$CI_COMMIT_REF_NAME"
     - mv build/libs/mangadex_at_home-${VERSION}-all.jar build/libs/mangadex_at_home.jar
     - docker build . -t ${CI_REGISTRY_IMAGE}:${VERSION}
     - docker push ${CI_REGISTRY_IMAGE}:${VERSION}

From 2a4c40e5cc89b02a02fb0569584d3b2eda103a93 Mon Sep 17 00:00:00 2001
From: carbotaniuman <quy.d.x.nguyen@gmail.com>
Date: Fri, 1 Oct 2021 00:18:30 -0500
Subject: [PATCH 3/7] Try regular alpine

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a67eb57..73c7458 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,6 @@
 stages:
   - build
   - publish
-  - publish_latest
   - publish_docker
 
 build:
@@ -18,7 +17,7 @@ build:
       - "build/libs/mangadex_at_home-*-all.jar"
 
 publish:
-  image: alpine/git
+  image: alpine
   stage: publish
 
   before_script:

From 1c200668dcf8106b4afb544aa04fca5a561acdce Mon Sep 17 00:00:00 2001
From: carbotaniuman <quy.d.x.nguyen@gmail.com>
Date: Fri, 1 Oct 2021 00:37:56 -0500
Subject: [PATCH 4/7] No more git in this one

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 73c7458..62045d9 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,7 +35,7 @@ publish:
       - "settings.sample.yaml"
 
 publish_docker:
-  image: docker:20.10.8-git
+  image: docker:20.10.8
   services:
     - docker:20.10.8-dind
   stage: publish

From 37edfd407fecef4e9db8a2503ce9f467c83936e3 Mon Sep 17 00:00:00 2001
From: carbotaniuman <quy.d.x.nguyen@gmail.com>
Date: Fri, 1 Oct 2021 00:44:19 -0500
Subject: [PATCH 5/7] Try now

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 62045d9..2b5d331 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ build:
       - "build/libs/mangadex_at_home-*-all.jar"
 
 publish:
-  image: alpine
+  image: ubuntu:bionic
   stage: publish
 
   before_script:

From 169c3ac0ff08a370b38dda3e8bf4b8428a75bb45 Mon Sep 17 00:00:00 2001
From: carbotaniuman <quy.d.x.nguyen@gmail.com>
Date: Fri, 1 Oct 2021 00:51:59 -0500
Subject: [PATCH 6/7] Try now

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b5d331..2df8cc8 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ build:
       - "build/libs/mangadex_at_home-*-all.jar"
 
 publish:
-  image: ubuntu:bionic
+  image: debian:buster-slim
   stage: publish
 
   before_script:

From fafb99bd8cef53f7a33e4541a73615d9a0d436ed Mon Sep 17 00:00:00 2001
From: carbotaniuman <quy.d.x.nguyen@gmail.com>
Date: Fri, 1 Oct 2021 01:01:40 -0500
Subject: [PATCH 7/7] Nyoron it is

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2df8cc8..0c3765e 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,10 +17,11 @@ build:
       - "build/libs/mangadex_at_home-*-all.jar"
 
 publish:
-  image: debian:buster-slim
+  image: alpine
   stage: publish
 
   before_script:
+    - apk update && apk add zip
     - export VERSION="$CI_COMMIT_REF_NAME"
   script:
     - cp build/libs/mangadex_at_home-${VERSION}-all.jar ./