Skip to content

Commit fb54717

Browse files
authored
Merge branch 'main' into dependabot/github_actions/docker/setup-buildx-action-4
2 parents e3a36cc + e3cbe67 commit fb54717

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

.github/workflows/github-docker-registry-push.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ jobs:
148148
149149
- name: Set up QEMU
150150
# This step sets up QEMU
151-
uses: docker/setup-qemu-action@v3
151+
uses: docker/setup-qemu-action@v4
152152

153153
- name: Set up Docker Buildx
154154
# This step sets up Docker Buildx
@@ -158,7 +158,7 @@ jobs:
158158
name: Login to GitHub Container Registry
159159
# This step logs in to GHCR
160160
if: env.HAS_DOCKER_CHANGES == 'true' && env.IS_FORK != 'true'
161-
uses: docker/login-action@v3
161+
uses: docker/login-action@v4
162162
with:
163163
registry: ghcr.io
164164
username: ${{ env.GHCR_USERNAME }}

dockerfiles/dotnet/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM jenkins/ssh-agent:7.14.0-jdk21 AS ssh-agent
1+
FROM jenkins/ssh-agent:7.15.0-jdk21 AS ssh-agent
22

33
# install dotnet dependencies
44
RUN apt-get update && apt-get install -y --no-install-recommends libc6 libgcc1 libgssapi-krb5-2 libicu72 libssl3 libstdc++6 zlib1g wget && apt-get clean && \

0 commit comments

Comments
 (0)