Skip to content

Commit 82e409c

Browse files
authored
Revert "Revert "[chore] Re-enable new dockerhub tokens (#1031)" (#1050)" (#1057)
This reverts commit 8f30d8c.
1 parent 321ebb5 commit 82e409c

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
@@ -101,8 +101,8 @@ jobs:
101101
- name: Log into Docker.io
102102
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
103103
with:
104-
username: ${{ secrets.DOCKER_USERNAME }}
105-
password: ${{ secrets.DOCKER_PASSWORD }}
104+
username: ${{ vars.DOCKER_USERNAME }}
105+
password: ${{ secrets.DOCKER_TOKEN_COLLECTOR_RELEASES }}
106106

107107
- name: Login to GitHub Package Registry
108108
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
@@ -236,8 +236,8 @@ jobs:
236236
- name: Log into Docker.io
237237
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
238238
with:
239-
username: ${{ secrets.DOCKER_USERNAME }}
240-
password: ${{ secrets.DOCKER_PASSWORD }}
239+
username: ${{ vars.DOCKER_USERNAME }}
240+
password: ${{ secrets.DOCKER_TOKEN_COLLECTOR_RELEASES }}
241241

242242
- name: Login to GitHub Package Registry
243243
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
@@ -81,8 +81,8 @@ jobs:
8181
- name: Log into Docker.io
8282
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
8383
with:
84-
username: ${{ secrets.DOCKER_USERNAME }}
85-
password: ${{ secrets.DOCKER_PASSWORD }}
84+
username: ${{ vars.DOCKER_USERNAME }}
85+
password: ${{ secrets.DOCKER_TOKEN_COLLECTOR_RELEASES }}
8686
- name: Login to GitHub Package Registry
8787
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
8888
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
@@ -81,8 +81,8 @@ jobs:
8181
- name: Log into Docker.io
8282
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
8383
with:
84-
username: ${{ secrets.DOCKER_USERNAME }}
85-
password: ${{ secrets.DOCKER_PASSWORD }}
84+
username: ${{ vars.DOCKER_USERNAME }}
85+
password: ${{ secrets.DOCKER_TOKEN_COLLECTOR_RELEASES }}
8686
- name: Login to GitHub Package Registry
8787
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
8888
with:

0 commit comments

Comments
 (0)