From 4d254952e323a15f460a4ee6d30eee81656d7b96 Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Mon, 9 Mar 2026 20:09:50 +0100
Subject: [PATCH] fix(ci): move Docker environment vars to environment

---
 .github/workflows/ci.yml                   |  2 --
 .github/workflows/docker-build.yml         | 16 ++++++++--------
 .github/workflows/docker-update-readme.yml |  6 ++++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 39ca388bc..78ce845f4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -422,8 +422,6 @@ jobs:
       packages: write # Needed to push package versions
       contents: read
     secrets:
-      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
       DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
 
 
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index bb6ce61b0..c053ef775 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -3,10 +3,6 @@ name: Docker Build and Deploy
 on:
   workflow_call:
     secrets:
-      DOCKER_PASSWORD:
-        required: true
-      DOCKER_USERNAME:
-        required: true
       DISCORD_WEBHOOK:
         required: false
   workflow_dispatch:
@@ -35,6 +31,8 @@ jobs:
     name: "Deploy Docker x64 and armv7l"
     runs-on: ubuntu-22.04
     if: github.repository == 'freqtrade/freqtrade'
+    environment:
+      name: docker
 
     steps:
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -59,8 +57,8 @@ jobs:
     - name: Login to Docker Hub
       uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
       with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
 
     - name: Set up QEMU
       uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
@@ -168,6 +166,8 @@ jobs:
     # Only run on 64bit machines
     runs-on: [self-hosted, linux, ARM64]
     if: github.repository == 'freqtrade/freqtrade'
+    environment:
+      name: docker
 
     steps:
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -181,8 +181,8 @@ jobs:
     - name: Login to Docker Hub
       uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
       with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
 
     - name: Login to github
       uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
diff --git a/.github/workflows/docker-update-readme.yml b/.github/workflows/docker-update-readme.yml
index 208bd0289..48c8c9a74 100644
--- a/.github/workflows/docker-update-readme.yml
+++ b/.github/workflows/docker-update-readme.yml
@@ -15,6 +15,8 @@ jobs:
   dockerHubDescription:
     name: "Update Docker Hub Description"
     runs-on: ubuntu-latest
+    environment:
+      name: docker
     steps:
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       with:
@@ -23,6 +25,6 @@ jobs:
     - name: Docker Hub Description
       uses: peter-evans/dockerhub-description@1b9a80c056b620d92cedb9d9b5a223409c68ddfa # v5.0.0
       with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
         repository: freqtradeorg/freqtrade