Skip to content

Commit 8f30d8c

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

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
@@ -76,8 +76,8 @@ jobs:
7676
- name: Log into Docker.io
7777
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
7878
with:
79-
username: ${{ vars.DOCKER_USERNAME }}
80-
password: ${{ secrets.DOCKER_TOKEN_COLLECTOR_RELEASES }}
79+
username: ${{ secrets.DOCKER_USERNAME }}
80+
password: ${{ secrets.DOCKER_PASSWORD }}
8181

8282
- name: Login to GitHub Package Registry
8383
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
@@ -210,8 +210,8 @@ jobs:
210210
- name: Log into Docker.io
211211
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
212212
with:
213-
username: ${{ vars.DOCKER_USERNAME }}
214-
password: ${{ secrets.DOCKER_TOKEN_COLLECTOR_RELEASES }}
213+
username: ${{ secrets.DOCKER_USERNAME }}
214+
password: ${{ secrets.DOCKER_PASSWORD }}
215215

216216
- name: Login to GitHub Package Registry
217217
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 using old token
13+
- name: Log into Docker.io
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
19+
- name: Log into Docker.io using new token
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: ${{ vars.DOCKER_USERNAME }}
56-
password: ${{ secrets.DOCKER_TOKEN_COLLECTOR_RELEASES }}
55+
username: ${{ secrets.DOCKER_USERNAME }}
56+
password: ${{ secrets.DOCKER_PASSWORD }}
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: ${{ vars.DOCKER_USERNAME }}
56-
password: ${{ secrets.DOCKER_TOKEN_COLLECTOR_RELEASES }}
55+
username: ${{ secrets.DOCKER_USERNAME }}
56+
password: ${{ secrets.DOCKER_PASSWORD }}
5757
- name: Login to GitHub Package Registry
5858
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
5959
with:

0 commit comments

Comments
 (0)