From e67868c44f9c6d059b59c286d310bf74ba1b9d7c Mon Sep 17 00:00:00 2001
From: glenux <glenux@glenux.net>
Date: Sat, 19 Oct 2024 08:48:29 +0000
Subject: [PATCH 1/6] Update Dockerfile

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5b23e89..180ec5c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,6 @@
-FROM drone/drone:2.22.0
 # FROM drone/drone:2.20.0
+# FROM drone/drone:2.22.0
+FROM drone/drone:2.24.0
 
 COPY entrypoint-wrapper.sh /usr/bin/entrypoint-wrapper
 
-- 
2.45.2


From 1d4206f07b0a4fdb0ad4f120fcdc832d8cada770 Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Sat, 19 Oct 2024 10:59:50 +0200
Subject: [PATCH 2/6] fix: remove empty environment

---
 .drone.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index ff7d990..3de2c7c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,8 +6,6 @@ name: default
 steps:
   - name: debug
     image: alpine
-    environment:
-
     commands:
       - 'echo "Repository: glenux/service-drone-server"'
       - 'echo "Git commit: ${DRONE_COMMIT_SHA:0:8}"'
-- 
2.45.2


From b22d8bf874881dc6df54039f5fcea4f1816370c7 Mon Sep 17 00:00:00 2001
From: glenux <glenux@glenux.net>
Date: Sat, 19 Oct 2024 09:04:19 +0000
Subject: [PATCH 3/6] Update Dockerfile

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 180ec5c..e5fa5d0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,3 +5,4 @@ FROM drone/drone:2.24.0
 COPY entrypoint-wrapper.sh /usr/bin/entrypoint-wrapper
 
 ENTRYPOINT ["/usr/bin/entrypoint-wrapper"]
+
-- 
2.45.2


From c2fec3515e3dcc8a511bcdf7491d6cda3f39e0fc Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Sat, 19 Oct 2024 11:56:15 +0200
Subject: [PATCH 4/6] docs: update dokku line

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

diff --git a/README.md b/README.md
index 5c0d0fc..935b976 100644
--- a/README.md
+++ b/README.md
@@ -43,3 +43,5 @@ Deploy
     git remote add dokku dokku@dokku.example.com:cicd
     git push dokku master
 
+    dokku git:from-image cicd "glenux/service-drone-server:$IMAGE_TAG"
+
-- 
2.45.2


From 903afefb748fc1be95f37bbf55cf07a9c0bf78f0 Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Sat, 19 Oct 2024 11:56:33 +0200
Subject: [PATCH 5/6] ci: fix misnaming of project

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

diff --git a/.drone.yml b/.drone.yml
index 3de2c7c..7f73d2d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -86,7 +86,7 @@ steps:
 #       - ssh -o StrictHostKeyChecking=no
 #             -i ~/.ssh/deploy_key
 #             "$SSH_USER@$SSH_HOST"
-#             git:from-image automation
+#             git:from-image cicd
 #             "glenux/service-drone-server:${DRONE_COMMIT_SHA:0:8}"
 #             #
 
-- 
2.45.2


From 5da1a6896056884925ec962c5923d52a83af0e79 Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Sat, 19 Oct 2024 12:15:44 +0200
Subject: [PATCH 6/6] ci: fix image tagging

---
 .drone.yml | 46 +++++-----------------------------------------
 1 file changed, 5 insertions(+), 41 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 7f73d2d..d56d5e5 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -12,10 +12,6 @@ steps:
 
   - name: publish:commit_sha
     image: plugins/docker
-    # pull: never
-    # volumes:
-    #   - name: cache
-    #     path: /stupid
     environment:
       DOCKER_REPO: glenux/service-drone-server
     settings:
@@ -23,46 +19,14 @@ steps:
         from_secret: DOCKERHUB_USERNAME
       password:
         from_secret: DOCKERHUB_PASSWORD
-      cache_from: "glenux/service-drone-server:latest_${DRONE_BRANCH/\\//-}"
+      cache_from: "glenux/service-drone-server:${DRONE_BRANCH/\\//-}_latest"
       repo: glenux/service-drone-server
-      tags: "${DRONE_COMMIT_SHA:0:8}"
+      tags:
+        - "${DRONE_BRANCH/\\//-}_${DRONE_COMMIT_SHA:0:8}"
+        - "${DRONE_BRANCH/\\//-}_latest"
+        - "latest"
       purge: false
 
-  - name: publish:commit_branch
-    image: plugins/docker
-    # volumes:
-    #   - name: cache
-    #     path: /stupid
-    settings:
-      username:
-        from_secret: DOCKERHUB_USERNAME
-      password:
-        from_secret: DOCKERHUB_PASSWORD
-      cache_from: "glenux/service-drone-server:latest_${DRONE_BRANCH/\\//-}"
-      repo: glenux/service-drone-server
-      tags: "latest_${DRONE_BRANCH/\\//-}"
-      purge: false
-    when:
-      branch:
-        - "master"
-        - "develop"
-        - "feature/*"
-
-  - name: publish:latest
-    image: plugins/docker
-    settings:
-      username:
-        from_secret: DOCKERHUB_USERNAME
-      password:
-        from_secret: DOCKERHUB_PASSWORD
-      cache_from: "glenux/service-drone-server:latest_${DRONE_BRANCH/\\//-}"
-      repo: glenux/service-drone-server
-      tags: latest
-      purge: false
-    when:
-      branch:
-        - master
-
 #   - name: deploy:dokku
 #     image: alpine
 #     when:
-- 
2.45.2