Skip to content

Commit b29252a

Browse files
authored
Merge branch 'main' into two-step-release-process
2 parents b91d098 + dd11b5b commit b29252a

File tree

5 files changed

+12
-14
lines changed

5 files changed

+12
-14
lines changed

.github/workflows/base-release.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ jobs:
100100
- name: Log into Docker.io
101101
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
102102
with:
103-
username: ${{ secrets.DOCKER_USERNAME }}
104-
password: ${{ secrets.DOCKER_PASSWORD }}
103+
username: ${{ vars.DOCKER_USERNAME }}
104+
password: ${{ secrets.DOCKER_TOKEN_COLLECTOR_RELEASES }}
105105

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

241241
- name: Login to GitHub Package Registry
242242
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 & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,8 @@ jobs:
8282
- name: Log into Docker.io
8383
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
8484
with:
85-
username: ${{ secrets.DOCKER_USERNAME }}
86-
password: ${{ secrets.DOCKER_PASSWORD }}
87-
85+
username: ${{ vars.DOCKER_USERNAME }}
86+
password: ${{ secrets.DOCKER_TOKEN_COLLECTOR_RELEASES }}
8887
- name: Login to GitHub Package Registry
8988
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
9089
with:

.github/workflows/release-opampsupervisor.yaml

Lines changed: 3 additions & 4 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
@@ -82,9 +82,8 @@ jobs:
8282
- name: Log into Docker.io
8383
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
8484
with:
85-
username: ${{ secrets.DOCKER_USERNAME }}
86-
password: ${{ secrets.DOCKER_PASSWORD }}
87-
85+
username: ${{ vars.DOCKER_USERNAME }}
86+
password: ${{ secrets.DOCKER_TOKEN_COLLECTOR_RELEASES }}
8887
- name: Login to GitHub Package Registry
8988
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
9089
with:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.24.5@sha256:fdcd2e5a34587bd5426c90e1531fd5ba448c89bb738df0f33860dfc69439a1f5
1+
FROM golang:1.24.5@sha256:267159cb984d1d034fce6e9db8641bf347f80e5f2e913561ea98c40d5051cb67
22

33
COPY --chmod=755 otelcol-ebpf-profiler /otelcol-ebpf-profiler
44
ENTRYPOINT ["/otelcol-ebpf-profiler"]

0 commit comments

Comments
 (0)