From 16b5edb35e18b78e3ea4fc86323dc29c2ddedfc3 Mon Sep 17 00:00:00 2001
From: Georgi Yankov <pseto1992@gmail.com>
Date: Thu, 17 Mar 2022 19:16:51 +0000
Subject: [PATCH 1/6] Update Prometheus and Grafana versions Remove
 `privileged:true` since its a huge security issue. No longer needed. Change
 placeholder for MDH image to an actual tag number.

---
 docker/docker-compose.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 060178d..c1a3433 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -4,7 +4,7 @@ services:
 
   mangadex-at-home:
     container_name: mangadex-at-home
-    image: "registry.gitlab.com/mangadex-pub/mangadex_at_home:<version>"
+    image: "registry.gitlab.com/mangadex-pub/mangadex_at_home:2"
     ports:
       - 443:443
     volumes:
@@ -12,7 +12,6 @@ services:
       - ./data/cache/:/mangahome/data/
     environment:
       JAVA_TOOL_OPTIONS: "-Xms1G -Xmx1G -XX:+UseShenandoahGC -Xss512K"
-    privileged: true
     command: [
         "bash",
         "-c",
@@ -31,7 +30,7 @@ services:
 
   prometheus:
     container_name: prometheus
-    image: prom/prometheus:v2.24.1
+    image: prom/prometheus:v2.34.0
     user: "root"
     group_add:
       - 0
@@ -50,7 +49,7 @@ services:
 
   grafana:
     container_name: grafana
-    image: grafana/grafana:7.4.0
+    image: grafana/grafana:8.4.3
     user: "root"
     group_add:
       - 0

From 10ac682a013ab6944325f5252cfc1c37653e32e6 Mon Sep 17 00:00:00 2001
From: Georgi Yankov <pseto1992@gmail.com>
Date: Thu, 17 Mar 2022 19:24:59 +0000
Subject: [PATCH 2/6] Update CI/CD, to reflect changes from docker-compose.yml
 version tagging

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 007aff6..d325a75 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,13 +52,14 @@ Docker Build:
 
   before_script:
     - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin ${CI_REGISTRY}
-    - export VERSION="${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}"
     - export BASE_TAG="git-$CI_COMMIT_SHORT_SHA"
+    - export SHORT_TAG="$(echo $CI_COMMIT_TAG | cut -d "." -f1)"
 
   script:
-    - mv build/libs/mangadex_at_home-${VERSION}-all.jar build/libs/mangadex_at_home.jar
-    - docker build . -t $CI_REGISTRY_IMAGE:$BASE_TAG
-    - docker push $CI_REGISTRY_IMAGE:$BASE_TAG
+    - docker pull $CI_REGISTRY_IMAGE:$BASE_TAG
+    - docker tag $CI_REGISTRY_IMAGE:$BASE_TAG $CI_REGISTRY_IMAGE:$NEW_TAG
+    - docker tag $CI_REGISTRY_IMAGE:$BASE_TAG $CI_REGISTRY_IMAGE:$SHORT_TAG
+    - docker push $CI_REGISTRY_IMAGE:$NEW_TAG
 
 .docker_push: &docker_push
   image: docker:20.10.8

From 1504729f61290087912b5eec3cb805f7e9e8f289 Mon Sep 17 00:00:00 2001
From: Georgi Yankov <pseto1992@gmail.com>
Date: Thu, 17 Mar 2022 19:46:45 +0000
Subject: [PATCH 3/6] Dumb update, just to get the pipeline kick in correctly.

---
 docker/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker/README.md b/docker/README.md
index 659f019..0026021 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -12,6 +12,8 @@ Once installed, you can check that it works by opening a command prompt and runn
 
 ## Run as a standalone container
 
+*Note* Changes to `the docker-compose.yml` are coming, and as such, this instruction page will get reworked a bit.
+
 Use either a specific image, preferrably the [latest image published](https://gitlab.com/mangadex-pub/mangadex_at_home/container_registry/1200259)
 
 > While it might work, using `registry.gitlab.com/mangadex-pub/mangadex_at_home:latest` is a bad idea as we do not guarantee forward-compatibility

From 1d8136f998b7579b035072b2cfe94a5195c1883c Mon Sep 17 00:00:00 2001
From: Georgi Yankov <pseto1992@gmail.com>
Date: Thu, 17 Mar 2022 20:03:26 +0000
Subject: [PATCH 4/6] Fix me being dumb

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d325a75..a2ef25b 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,13 +53,13 @@ Docker Build:
   before_script:
     - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin ${CI_REGISTRY}
     - export BASE_TAG="git-$CI_COMMIT_SHORT_SHA"
-    - export SHORT_TAG="$(echo $CI_COMMIT_TAG | cut -d "." -f1)"
+    - export VERSION="${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}"
+    - export BASE_TAG="git-$CI_COMMIT_SHORT_SHA"
 
   script:
-    - docker pull $CI_REGISTRY_IMAGE:$BASE_TAG
-    - docker tag $CI_REGISTRY_IMAGE:$BASE_TAG $CI_REGISTRY_IMAGE:$NEW_TAG
-    - docker tag $CI_REGISTRY_IMAGE:$BASE_TAG $CI_REGISTRY_IMAGE:$SHORT_TAG
-    - docker push $CI_REGISTRY_IMAGE:$NEW_TAG
+    - mv build/libs/mangadex_at_home-${VERSION}-all.jar build/libs/mangadex_at_home.jar
+    - docker build . -t $CI_REGISTRY_IMAGE:$BASE_TAG
+
 
 .docker_push: &docker_push
   image: docker:20.10.8
@@ -72,10 +72,12 @@ Docker Build:
   before_script:
     - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin ${CI_REGISTRY}
     - export BASE_TAG="git-$CI_COMMIT_SHORT_SHA"
+    - export SHORT_TAG="$(echo $CI_COMMIT_TAG | cut -d "." -f1)"
 
   script:
     - docker pull $CI_REGISTRY_IMAGE:$BASE_TAG
     - docker tag $CI_REGISTRY_IMAGE:$BASE_TAG $CI_REGISTRY_IMAGE:$NEW_TAG
+    - docker tag $CI_REGISTRY_IMAGE:$BASE_TAG $CI_REGISTRY_IMAGE:$SHORT_TAG
     - docker push $CI_REGISTRY_IMAGE:$NEW_TAG
 
 Push Latest:

From fd5260d9eaa95eb6341b6892b4b9c3caa5455ffc Mon Sep 17 00:00:00 2001
From: Georgi Yankov <pseto1992@gmail.com>
Date: Thu, 17 Mar 2022 20:07:52 +0000
Subject: [PATCH 5/6] Be less of an idiot

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2ef25b..72ef97a 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,13 +52,13 @@ Docker Build:
 
   before_script:
     - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin ${CI_REGISTRY}
-    - export BASE_TAG="git-$CI_COMMIT_SHORT_SHA"
     - export VERSION="${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}"
     - export BASE_TAG="git-$CI_COMMIT_SHORT_SHA"
 
   script:
     - mv build/libs/mangadex_at_home-${VERSION}-all.jar build/libs/mangadex_at_home.jar
     - docker build . -t $CI_REGISTRY_IMAGE:$BASE_TAG
+    - docker push $CI_REGISTRY_IMAGE:$BASE_TAG
 
 
 .docker_push: &docker_push

From 05f8c5b56fb8040b23d1e47eb7409bae12160762 Mon Sep 17 00:00:00 2001
From: Georgi Yankov <pseto1992@gmail.com>
Date: Thu, 17 Mar 2022 20:36:30 +0000
Subject: [PATCH 6/6] Push all tags

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 72ef97a..304d32c 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,7 +78,7 @@ Docker Build:
     - docker pull $CI_REGISTRY_IMAGE:$BASE_TAG
     - docker tag $CI_REGISTRY_IMAGE:$BASE_TAG $CI_REGISTRY_IMAGE:$NEW_TAG
     - docker tag $CI_REGISTRY_IMAGE:$BASE_TAG $CI_REGISTRY_IMAGE:$SHORT_TAG
-    - docker push $CI_REGISTRY_IMAGE:$NEW_TAG
+    - docker push $CI_REGISTRY_IMAGE --all-tags
 
 Push Latest:
   <<: *docker_push