Skip to content

Commit d4ecd3c

Browse files
committed
Revert "Revert "[chore] Re-enable new dockerhub tokens (#1031)" (#1050)"
This reverts commit 8f30d8c.
1 parent edaf1aa commit d4ecd3c

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

.github/workflows/base-release.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ jobs:
7878
- name: Log into Docker.io
7979
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
8080
with:
81-
username: ${{ secrets.DOCKER_USERNAME }}
82-
password: ${{ secrets.DOCKER_PASSWORD }}
81+
username: ${{ vars.DOCKER_USERNAME }}
82+
password: ${{ secrets.DOCKER_TOKEN_COLLECTOR_RELEASES }}
8383

8484
- name: Login to GitHub Package Registry
8585
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
@@ -212,8 +212,8 @@ jobs:
212212
- name: Log into Docker.io
213213
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
214214
with:
215-
username: ${{ secrets.DOCKER_USERNAME }}
216-
password: ${{ secrets.DOCKER_PASSWORD }}
215+
username: ${{ vars.DOCKER_USERNAME }}
216+
password: ${{ secrets.DOCKER_TOKEN_COLLECTOR_RELEASES }}
217217

218218
- name: Login to GitHub Package Registry
219219
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0

.github/workflows/regression-tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
name: Check docker token
1111
runs-on: ubuntu-22.04
1212
steps:
13-
- name: Log into Docker.io
13+
- name: Log into Docker.io using old token
1414
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
1515
with:
1616
username: ${{ secrets.DOCKER_USERNAME }}
1717
password: ${{ secrets.DOCKER_PASSWORD }}
1818

19-
- name: Log into Docker.io using new token
19+
- name: Log into Docker.io
2020
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
2121
with:
2222
username: ${{ vars.DOCKER_USERNAME }}

.github/workflows/release-builder.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ jobs:
5252
- name: Log into Docker.io
5353
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
5454
with:
55-
username: ${{ secrets.DOCKER_USERNAME }}
56-
password: ${{ secrets.DOCKER_PASSWORD }}
55+
username: ${{ vars.DOCKER_USERNAME }}
56+
password: ${{ secrets.DOCKER_TOKEN_COLLECTOR_RELEASES }}
5757
- name: Login to GitHub Package Registry
5858
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
5959
with:

.github/workflows/release-opampsupervisor.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ env:
1111
jobs:
1212
goreleaser:
1313
runs-on: ubuntu-latest
14-
14+
1515
permissions:
1616
id-token: write
1717
packages: write
@@ -52,8 +52,8 @@ jobs:
5252
- name: Log into Docker.io
5353
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
5454
with:
55-
username: ${{ secrets.DOCKER_USERNAME }}
56-
password: ${{ secrets.DOCKER_PASSWORD }}
55+
username: ${{ vars.DOCKER_USERNAME }}
56+
password: ${{ secrets.DOCKER_TOKEN_COLLECTOR_RELEASES }}
5757
- name: Login to GitHub Package Registry
5858
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
5959
with:

0 commit comments

Comments
 (0)