From cdc56b3cfdf20a8bf768e1fa6fd6a1f063780b15 Mon Sep 17 00:00:00 2001
From: drone <git@ar21.de>
Date: Sat, 9 Jul 2022 00:17:41 +0000
Subject: [PATCH 01/30] Update dependency py-cord to v2.0.0

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 027a78e..42cde26 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-py-cord==2.0.0rc1
+py-cord==2.0.0

From 030072011116883f447955b3c967a1201bebfb10 Mon Sep 17 00:00:00 2001
From: Aaron Riedel <git@ar21.de>
Date: Thu, 21 Jul 2022 17:42:08 +0200
Subject: [PATCH 02/30] fix drone ci

---
 .drone.yml | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 5be9a4c..0f42d89 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -12,10 +12,8 @@ steps:
     tags: latest
   when:
     branch:
-      include:
       - master
     event:
-      include:
       - push
 - name: docker-build
   image: plugins/docker
@@ -28,12 +26,11 @@ steps:
     tags: latest
     dry_run: true
   when:
-    branch:
-      exclude:
-      - master
-    event:
-      exclude:
-      - push
+    exclude:
+      branch:
+        - master
+      event:
+        - push
 - name: dev docker
   image: plugins/docker
   settings:
@@ -45,10 +42,8 @@ steps:
     tags: dev
   when:
     branch:
-      include:
       - dev
     event:
-      include:
       - push
 - name: deploy
   image: appleboy/drone-ssh
@@ -64,10 +59,8 @@ steps:
       - cd /root && docker-compose pull shbot && docker-compose up -d shbot
   when:
     branch:
-      include:
       - master
     event:
-      include:
       - push
 - name: deploy dev
   image: appleboy/drone-ssh
@@ -83,8 +76,6 @@ steps:
       - cd /root && docker-compose -f shbot-dev.yaml pull shbot-dev && docker-compose -f shbot-dev.yaml up -d shbot-dev
   when:
     branch:
-      include:
       - dev
     event:
-      include:
       - push
\ No newline at end of file

From 06f099ca1801518a6f509d5f617938a8a1ff93bb Mon Sep 17 00:00:00 2001
From: drone <git@ar21.de>
Date: Tue, 2 Aug 2022 21:17:16 +0000
Subject: [PATCH 03/30] Update dependency python to v3.10.6

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

diff --git a/Dockerfile b/Dockerfile
index 6f2ad2a..1246ff1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.10.5-alpine3.15
+FROM python:3.10.6-alpine3.15
 
 WORKDIR ./
 ARG PUID=1000

From faa702ce0536510d0cb0da827d8b299ad3c19d0d Mon Sep 17 00:00:00 2001
From: drone <git@ar21.de>
Date: Tue, 16 Aug 2022 21:18:17 +0000
Subject: [PATCH 04/30] Update dependency py-cord to v2.0.1

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 42cde26..8798123 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-py-cord==2.0.0
+py-cord==2.0.1

From 1c09edb25b394fac22e27e5ab2d803c46e15157e Mon Sep 17 00:00:00 2001
From: drone <git@ar21.de>
Date: Thu, 25 Aug 2022 16:18:18 +0000
Subject: [PATCH 05/30] Update dependency py-cord to v2.1.0

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 8798123..41e8ea6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-py-cord==2.0.1
+py-cord==2.1.0

From 84b8379926f0f4f81a1d7d831f81ca6bd477f8ed Mon Sep 17 00:00:00 2001
From: drone <git@ar21.de>
Date: Thu, 25 Aug 2022 22:18:18 +0000
Subject: [PATCH 06/30] Update dependency py-cord to v2.1.1

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 41e8ea6..97e2aa0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-py-cord==2.1.0
+py-cord==2.1.1

From 281ad8f957515bedadc980e8b050adb36d0b9a68 Mon Sep 17 00:00:00 2001
From: drone <git@ar21.de>
Date: Tue, 6 Sep 2022 21:18:18 +0000
Subject: [PATCH 07/30] Update dependency py-cord to v2.1.2

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 97e2aa0..f7d07ed 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-py-cord==2.1.1
+py-cord==2.1.2

From 7efe4b3c1340874ef48d9499d32049ea29254920 Mon Sep 17 00:00:00 2001
From: drone <git@ar21.de>
Date: Wed, 7 Sep 2022 14:18:18 +0000
Subject: [PATCH 08/30] Update dependency py-cord to v2.1.3

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index f7d07ed..064372a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-py-cord==2.1.2
+py-cord==2.1.3

From 2cb6af2062acf89d0d3b05e1265fad5195cd31c5 Mon Sep 17 00:00:00 2001
From: Aaron Riedel <git@ar21.de>
Date: Thu, 8 Sep 2022 00:30:25 +0200
Subject: [PATCH 09/30] add architecture to Dockerfile

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

diff --git a/Dockerfile b/Dockerfile
index 1246ff1..f0c6d71 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.10.6-alpine3.15
+FROM amd64/python:3.10.6-alpine3.15
 
 WORKDIR ./
 ARG PUID=1000

From 7cd2883dc03f53ee1c80339b808744f863c2849b Mon Sep 17 00:00:00 2001
From: Aaron Riedel <git@ar21.de>
Date: Thu, 8 Sep 2022 00:32:14 +0200
Subject: [PATCH 10/30] update base image

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

diff --git a/Dockerfile b/Dockerfile
index f0c6d71..9516bef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM amd64/python:3.10.6-alpine3.15
+FROM amd64/python:3.10.7-alpine3.15
 
 WORKDIR ./
 ARG PUID=1000

From fd7b680eb8f2e7112142d358f1fbdba976981d57 Mon Sep 17 00:00:00 2001
From: Aaron Riedel <git@ar21.de>
Date: Thu, 8 Sep 2022 00:36:09 +0200
Subject: [PATCH 11/30] update base image

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

diff --git a/Dockerfile b/Dockerfile
index 9516bef..f625242 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM amd64/python:3.10.7-alpine3.15
+FROM amd64/python:3.10.7-alpine3.16
 
 WORKDIR ./
 ARG PUID=1000

From c33714f2e714419ebb123a29614b7781e792c5e8 Mon Sep 17 00:00:00 2001
From: drone <git@ar21.de>
Date: Sun, 2 Oct 2022 22:12:42 +0000
Subject: [PATCH 12/30] Update dependency py-cord to v2.2.0

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 064372a..2820bfa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-py-cord==2.1.3
+py-cord==2.2.0

From 7ec737640524a771ee5be5171aa009a0a6d776d1 Mon Sep 17 00:00:00 2001
From: drone <git@ar21.de>
Date: Thu, 6 Oct 2022 02:12:42 +0000
Subject: [PATCH 13/30] Update dependency py-cord to v2.2.1

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 2820bfa..ee8d8d2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-py-cord==2.2.0
+py-cord==2.2.1

From 533e45acaef9dd86830edf1f0006490fd8107b0a Mon Sep 17 00:00:00 2001
From: drone <git@ar21.de>
Date: Fri, 14 Oct 2022 01:27:51 +0000
Subject: [PATCH 14/30] Update python Docker tag to v3.10.8

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

diff --git a/Dockerfile b/Dockerfile
index f625242..7374efc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM amd64/python:3.10.7-alpine3.16
+FROM amd64/python:3.10.8-alpine3.16
 
 WORKDIR ./
 ARG PUID=1000

From d91151f931803a53ac6ff4b282c7c758feba8f72 Mon Sep 17 00:00:00 2001
From: drone <git@ar21.de>
Date: Wed, 12 Oct 2022 22:13:41 +0000
Subject: [PATCH 15/30] Update dependency py-cord to v2.2.2

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index ee8d8d2..1300958 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-py-cord==2.2.1
+py-cord==2.2.2

From 65a7e9048eec6d0a01d7080bef3c812c098accec Mon Sep 17 00:00:00 2001
From: drone <git@ar21.de>
Date: Wed, 23 Nov 2022 22:05:20 +0000
Subject: [PATCH 16/30] Update dependency py-cord to v2.3.0

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 1300958..5d6933b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-py-cord==2.2.2
+py-cord==2.3.0

From b4116bf6a08d7c3bcb00f98efd6cc2b81fb3e220 Mon Sep 17 00:00:00 2001
From: drone <git@ar21.de>
Date: Thu, 8 Dec 2022 05:05:20 +0000
Subject: [PATCH 17/30] Update python Docker tag to v3.11.1

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

diff --git a/Dockerfile b/Dockerfile
index 7374efc..9a2e7e9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM amd64/python:3.10.8-alpine3.16
+FROM amd64/python:3.11.1-alpine3.16
 
 WORKDIR ./
 ARG PUID=1000

From 81f84dddf431ea2ea3981719f5636f838d863281 Mon Sep 17 00:00:00 2001
From: drone <git@ar21.de>
Date: Tue, 13 Dec 2022 23:58:02 +0000
Subject: [PATCH 18/30] Update dependency py-cord to v2.3.2

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 5d6933b..59e995e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-py-cord==2.3.0
+py-cord==2.3.2

From a34af09bebb07b9ae118a257c92f949f10e580b0 Mon Sep 17 00:00:00 2001
From: drone <git@ar21.de>
Date: Thu, 9 Feb 2023 02:26:51 +0000
Subject: [PATCH 19/30] Update python Docker tag to v3.11.2

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

diff --git a/Dockerfile b/Dockerfile
index 9a2e7e9..2bed68e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM amd64/python:3.11.1-alpine3.16
+FROM amd64/python:3.11.2-alpine3.16
 
 WORKDIR ./
 ARG PUID=1000

From b4fbdc762897123e984093471f66d565da085546 Mon Sep 17 00:00:00 2001
From: Aaron Riedel <git@ar21.de>
Date: Sat, 11 Feb 2023 03:15:50 +0000
Subject: [PATCH 20/30] Update dependency py-cord to v2.3.3

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 59e995e..1be895a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-py-cord==2.3.2
+py-cord==2.3.3

From 5fdf2b666c005d2daecb5778332c960057cf1d8a Mon Sep 17 00:00:00 2001
From: Aaron Riedel <git@ar21.de>
Date: Sat, 11 Feb 2023 13:16:49 +0000
Subject: [PATCH 21/30] Update dependency py-cord to v2.4.0

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 1be895a..bd223b0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-py-cord==2.3.3
+py-cord==2.4.0

From a0aa24bb41c87b6908324bb50ed0f0ab1c3e58c8 Mon Sep 17 00:00:00 2001
From: Aaron Riedel <git@ar21.de>
Date: Mon, 13 Feb 2023 22:19:42 +0100
Subject: [PATCH 22/30] update README for gitea environment

---
 README.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index baebe92..af469a1 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,22 @@
 # SECOND BOT
-[![pipeline status](https://git.cxservers.com/aaron-riedel/shbot/badges/master/pipeline.svg)](https://git.cxservers.com/aaron-riedel/shbot/-/commits/master)
+[![Build Status](https://drone.ar21.de/api/badges/secondhemd/shbot/status.svg)](https://drone.ar21.de/secondhemd/shbot)
 
 der Bot für den SecondHemd Discord
 
 # Latest
 ## Build
 ```
-docker build -t docker-registry.cxservers.com/aaron-riedel/shbot:latest .
+docker build -t secondhemd/shbot:latest .
 ```
 ## Run
 ```
-sudo docker run -e 'TOKEN=' -e 'PREFIX=$' -t docker-registry.cxservers.com/aaron-riedel/shbot:latest
+sudo docker run -e 'TOKEN=' -e 'PREFIX=$' -t secondhemd/shbot:latest
 ```
 ## Docker compose
 ```
 services:
   bot:
-    image: docker-registry.cxservers.com/aaron-riedel/shbot:latest
+    image: secondhemd/shbot:latest
     container_name: shbot
     restart: unless-stopped
     environment:
@@ -27,17 +27,17 @@ services:
 # Development
 ## Build
 ```
-docker build -t docker-registry.cxservers.com/aaron-riedel/shbot:dev .
+docker build -t secondhemd/shbot:dev .
 ```
 ## Run
 ```
-sudo docker run -e 'TOKEN=' -e 'PREFIX=$' -t docker-registry.cxservers.com/aaron-riedel/shbot:dev
+sudo docker run -e 'TOKEN=' -e 'PREFIX=$' -t secondhemd/shbot:dev
 ```
 ## Docker compose
 ```
 services:
   bot:
-    image: docker-registry.cxservers.com/aaron-riedel/shbot:dev
+    image: secondhemd/shbot:dev
     container_name: shbot
     restart: unless-stopped
     environment:

From b5ec9bac9202747841926af54a84acc23483c0c6 Mon Sep 17 00:00:00 2001
From: Aaron Riedel <git@ar21.de>
Date: Mon, 20 Mar 2023 23:06:42 +0000
Subject: [PATCH 23/30] Update dependency py-cord to v2.4.1

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index bd223b0..5f27b6b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-py-cord==2.4.0
+py-cord==2.4.1

From 4a029f3bcd7722ea7e2ba0d24ffd5ba9360afd4a Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@ar21.de>
Date: Thu, 6 Apr 2023 01:07:49 +0000
Subject: [PATCH 24/30] Update python Docker tag to v3.11.3

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

diff --git a/Dockerfile b/Dockerfile
index 2bed68e..f663dcc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM amd64/python:3.11.2-alpine3.16
+FROM amd64/python:3.11.3-alpine3.16
 
 WORKDIR ./
 ARG PUID=1000

From ee561c5356cf7b61b8ac4d53557c801dc9494f67 Mon Sep 17 00:00:00 2001
From: Aaron Riedel <git@ar21.de>
Date: Mon, 29 May 2023 23:04:45 +0200
Subject: [PATCH 25/30] reduce prune days to 7

---
 bot.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bot.py b/bot.py
index 29c7387..7d58e3b 100644
--- a/bot.py
+++ b/bot.py
@@ -414,7 +414,7 @@ async def hiebe(ctx, *, arg):
             await user.create_dm()
         await user.dm_channel.send("HIEBE :punch: von {}".format(ctx.author.display_name))
 
-@bot.command(help="kickt Member ohne Rolle, die 30 Tage nicht online waren", usage="")
+@bot.command(help="kickt Member ohne Rolle, die 7 Tage nicht online waren", usage="")
 @is_admin()
 async def prune(ctx):
     await ctx.message.delete()
@@ -427,8 +427,8 @@ async def prune(ctx):
         await ctx.send(content="Zeit ausgelaufen", delete_after=5.0)
     elif view.value:
         await question.delete()
-        deleted = await ctx.guild.prune_members(days=30)
-        await ctx.send(content='Ich habe {} Leichen beseitigt.'.format(deleted), delete_after=5.0)
+        deleted = await ctx.guild.prune_members(days=7)
+        await ctx.send(content='Ich habe {} Leiche(n) beseitigt.'.format(deleted), delete_after=5.0)
     else:
         await question.delete()
 

From e753423957fd8390199a60ed9993efa29a1bba84 Mon Sep 17 00:00:00 2001
From: Aaron Riedel <git@ar21.de>
Date: Mon, 29 May 2023 23:04:57 +0200
Subject: [PATCH 26/30] remove whitespace

---
 bot.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bot.py b/bot.py
index 7d58e3b..2a4c642 100644
--- a/bot.py
+++ b/bot.py
@@ -101,7 +101,7 @@ class Confirm(discord.ui.View):
 
 @bot.slash_command(guild_ids=[261575556708040705])
 @commands.has_role(member_role)
-async def roll(ctx, 
+async def roll(ctx,
     dice: Option(str, "Würfel den/die du werfen willst. z.B. W20, 3d6", default="W20"),
     ):
     """Rolle einen oder mehrere Würfel"""
@@ -134,7 +134,7 @@ async def roll(ctx,
 
 @bot.slash_command(guild_ids=[261575556708040705])
 @commands.has_role(gm_role)
-async def gmroll(ctx, 
+async def gmroll(ctx,
     dice: Option(str, "Würfel den/die du werfen willst. z.B. W20, 3d6", default="W20"),
     ):
     """Rolle einen oder mehrere Würfel verdeckt"""
@@ -178,7 +178,7 @@ class MyModal(Modal):
         original_message = await interaction.channel.fetch_message(self.message_id)
         for x in list(emojitext):
             await original_message.add_reaction(alphabet[x])
-        
+
 
 @bot.message_command(name="Emoji Text", guild_ids=[261575556708040705])
 @commands.has_role(member_role)

From f9c496d1589a9dee3b84fd6d10ab6272b75fc378 Mon Sep 17 00:00:00 2001
From: Aaron Riedel <git@ar21.de>
Date: Sun, 24 Sep 2023 04:35:05 +0200
Subject: [PATCH 27/30] update pipeline

---
 .drone.yml | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 0f42d89..2fd10a7 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,7 +1,7 @@
 kind: pipeline
 name: deploy
 steps:
-- name: docker 
+- name: docker
   image: plugins/docker
   settings:
     username:
@@ -13,8 +13,6 @@ steps:
   when:
     branch:
       - master
-    event:
-      - push
 - name: docker-build
   image: plugins/docker
   settings:
@@ -26,11 +24,9 @@ steps:
     tags: latest
     dry_run: true
   when:
-    exclude:
-      branch:
+    branch:
+      exclude:
         - master
-      event:
-        - push
 - name: dev docker
   image: plugins/docker
   settings:
@@ -43,8 +39,6 @@ steps:
   when:
     branch:
       - dev
-    event:
-      - push
 - name: deploy
   image: appleboy/drone-ssh
   settings:
@@ -60,8 +54,6 @@ steps:
   when:
     branch:
       - master
-    event:
-      - push
 - name: deploy dev
   image: appleboy/drone-ssh
   settings:
@@ -77,5 +69,6 @@ steps:
   when:
     branch:
       - dev
-    event:
-      - push
\ No newline at end of file
+when:
+  event:
+    - push
\ No newline at end of file

From 74fe90b2423c3a395367d1796d0113ed4fc77ba9 Mon Sep 17 00:00:00 2001
From: Aaron Riedel <git@ar21.de>
Date: Sat, 25 Nov 2023 21:21:35 +0100
Subject: [PATCH 28/30] update pipeline because of new docker compose

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

diff --git a/.drone.yml b/.drone.yml
index 2fd10a7..c585747 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -50,7 +50,7 @@ steps:
     port: 22
     command_timeout: 2m
     script:
-      - cd /root && docker-compose pull shbot && docker-compose up -d shbot
+      - cd /root && docker compose pull shbot && docker compose up -d shbot
   when:
     branch:
       - master
@@ -65,7 +65,7 @@ steps:
     port: 22
     command_timeout: 2m
     script:
-      - cd /root && docker-compose -f shbot-dev.yaml pull shbot-dev && docker-compose -f shbot-dev.yaml up -d shbot-dev
+      - cd /root && docker compose -f shbot-dev.yaml pull shbot-dev && docker compose -f shbot-dev.yaml up -d shbot-dev
   when:
     branch:
       - dev

From 2a46a5463705800fe6418e4ceac059cfb5e1f1e1 Mon Sep 17 00:00:00 2001
From: Aaron Riedel <git@ar21.de>
Date: Sun, 24 Dec 2023 20:27:54 +0100
Subject: [PATCH 29/30] change container registry

---
 .drone.yml | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index c585747..62e6d3e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2,25 +2,23 @@ kind: pipeline
 name: deploy
 steps:
 - name: docker
-  image: plugins/docker
-  settings:
+  registry: git.ar21.de
     username:
-      from_secret: DOCKER_USERNAME
+      from_secret: REGISTRY_USER
     password:
-      from_secret: DOCKER_PASSWORD
-    repo: secondhemd/shbot
+      from_secret: REGISTRY_PASS
+    repo: git.ar21.de/secondhemd/shbot
     tags: latest
   when:
     branch:
       - master
 - name: docker-build
-  image: plugins/docker
-  settings:
+  registry: git.ar21.de
     username:
-      from_secret: DOCKER_USERNAME
+      from_secret: REGISTRY_USER
     password:
-      from_secret: DOCKER_PASSWORD
-    repo: secondhemd/shbot
+      from_secret: REGISTRY_PASS
+    repo: git.ar21.de/secondhemd/shbot
     tags: latest
     dry_run: true
   when:
@@ -30,11 +28,12 @@ steps:
 - name: dev docker
   image: plugins/docker
   settings:
+    registry: git.ar21.de
     username:
-      from_secret: DOCKER_USERNAME
+      from_secret: REGISTRY_USER
     password:
-      from_secret: DOCKER_PASSWORD
-    repo: secondhemd/shbot
+      from_secret: REGISTRY_PASS
+    repo: git.ar21.de/secondhemd/shbot
     tags: dev
   when:
     branch:

From 43a01a753ba9e2938f616ead079a92549bac6f17 Mon Sep 17 00:00:00 2001
From: Aaron Riedel <git@ar21.de>
Date: Sun, 24 Dec 2023 20:29:10 +0100
Subject: [PATCH 30/30] fix container registry

---
 .drone.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 62e6d3e..4aa32d9 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2,7 +2,9 @@ kind: pipeline
 name: deploy
 steps:
 - name: docker
-  registry: git.ar21.de
+  image: plugins/docker
+  settings:
+    registry: git.ar21.de
     username:
       from_secret: REGISTRY_USER
     password:
@@ -13,7 +15,9 @@ steps:
     branch:
       - master
 - name: docker-build
-  registry: git.ar21.de
+  image: plugins/docker
+  settings:
+    registry: git.ar21.de
     username:
       from_secret: REGISTRY_USER
     password: