Skip to content

Commit 4d25495

Browse files
committed
fix(ci): move Docker environment vars to environment
1 parent 24c57b5 commit 4d25495

3 files changed

Lines changed: 12 additions & 12 deletions

File tree

.github/workflows/ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,8 +422,6 @@ jobs:
422422
packages: write # Needed to push package versions
423423
contents: read
424424
secrets:
425-
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
426-
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
427425
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
428426

429427

.github/workflows/docker-build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ name: Docker Build and Deploy
33
on:
44
workflow_call:
55
secrets:
6-
DOCKER_PASSWORD:
7-
required: true
8-
DOCKER_USERNAME:
9-
required: true
106
DISCORD_WEBHOOK:
117
required: false
128
workflow_dispatch:
@@ -35,6 +31,8 @@ jobs:
3531
name: "Deploy Docker x64 and armv7l"
3632
runs-on: ubuntu-22.04
3733
if: github.repository == 'freqtrade/freqtrade'
34+
environment:
35+
name: docker
3836

3937
steps:
4038
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -59,8 +57,8 @@ jobs:
5957
- name: Login to Docker Hub
6058
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
6159
with:
62-
username: ${{ secrets.DOCKER_USERNAME }}
63-
password: ${{ secrets.DOCKER_PASSWORD }}
60+
username: ${{ secrets.DOCKERHUB_USERNAME }}
61+
password: ${{ secrets.DOCKERHUB_TOKEN }}
6462

6563
- name: Set up QEMU
6664
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
@@ -168,6 +166,8 @@ jobs:
168166
# Only run on 64bit machines
169167
runs-on: [self-hosted, linux, ARM64]
170168
if: github.repository == 'freqtrade/freqtrade'
169+
environment:
170+
name: docker
171171

172172
steps:
173173
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -181,8 +181,8 @@ jobs:
181181
- name: Login to Docker Hub
182182
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
183183
with:
184-
username: ${{ secrets.DOCKER_USERNAME }}
185-
password: ${{ secrets.DOCKER_PASSWORD }}
184+
username: ${{ secrets.DOCKERHUB_USERNAME }}
185+
password: ${{ secrets.DOCKERHUB_TOKEN }}
186186

187187
- name: Login to github
188188
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0

.github/workflows/docker-update-readme.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ jobs:
1515
dockerHubDescription:
1616
name: "Update Docker Hub Description"
1717
runs-on: ubuntu-latest
18+
environment:
19+
name: docker
1820
steps:
1921
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2022
with:
@@ -23,6 +25,6 @@ jobs:
2325
- name: Docker Hub Description
2426
uses: peter-evans/dockerhub-description@1b9a80c056b620d92cedb9d9b5a223409c68ddfa # v5.0.0
2527
with:
26-
username: ${{ secrets.DOCKER_USERNAME }}
27-
password: ${{ secrets.DOCKER_PASSWORD }}
28+
username: ${{ secrets.DOCKERHUB_USERNAME }}
29+
password: ${{ secrets.DOCKERHUB_TOKEN }}
2830
repository: freqtradeorg/freqtrade

0 commit comments

Comments
 (0)