Skip to content

Commit 357abd3

Browse files
authored
Merge branch 'master' into dependabot/go_modules/testdata/stable-updates-2233fe45c4
2 parents ed5ee92 + dc7cbce commit 357abd3

File tree

3 files changed

+34
-17
lines changed

3 files changed

+34
-17
lines changed

.github/workflows/release.yaml

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ on:
55
types:
66
- created
77

8+
permissions:
9+
contents: read
10+
packages: write
11+
12+
env:
13+
REGISTRY: ghcr.io
14+
815
jobs:
916
build_docker:
1017
name: Build docker image release
@@ -13,23 +20,24 @@ jobs:
1320
GHZ_VERSION: "0.95.0"
1421
steps:
1522
- name: Checkout code
16-
uses: actions/checkout@v2
23+
uses: actions/checkout@v6
1724

1825
- name: Set up Docker Buildx
19-
uses: docker/setup-buildx-action@v1
26+
uses: docker/setup-buildx-action@v3
2027

21-
- name: Login to DockerHub
22-
uses: docker/login-action@v1
28+
- name: Log in to the Container registry
29+
uses: docker/login-action@v3
2330
with:
24-
username: hellofreshtech
25-
password: ${{ secrets.DOCKER_TOKEN }}
31+
registry: ${{ env.REGISTRY }}
32+
username: ${{ github.actor }}
33+
password: ${{ secrets.GITHUB_TOKEN }}
2634

2735
- name: Build and push Docker base image
28-
uses: docker/build-push-action@v2
36+
uses: docker/build-push-action@v6
2937
with:
3038
push: true
3139
build-args: |
3240
GHZ_VERSION=${{env.GHZ_VERSION}}
3341
tags: |
34-
hellofresh/kangal-ghz:${{env.GHZ_VERSION}}
35-
hellofresh/kangal-ghz:latest
42+
${{env.REGISTRY}}/hellofresh/kangal-ghz:${{env.GHZ_VERSION}}
43+
${{env.REGISTRY}}/hellofresh/kangal-ghz:latest

.github/workflows/test.yaml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
name: "Testing"
23

34
on:
@@ -14,10 +15,12 @@ jobs:
1415
runs-on: ubuntu-latest
1516
steps:
1617
- name: Checkout
17-
uses: actions/checkout@v2
18+
uses: actions/checkout@v6
19+
with:
20+
fetch-depth: 0
1821

1922
- name: Lint
20-
uses: github/super-linter@v4
23+
uses: github/super-linter@v5
2124
env:
2225
FILTER_REGEX_EXCLUDE: .*testdata/.*
2326
VALIDATE_ALL_CODEBASE: false
@@ -30,37 +33,37 @@ jobs:
3033
runs-on: ubuntu-latest
3134
steps:
3235
- name: Checkout
33-
uses: actions/checkout@v2
36+
uses: actions/checkout@v6
3437

3538
- name: Build Docker image
36-
uses: docker/build-push-action@v2
39+
uses: docker/build-push-action@v6
3740
with:
3841
tags: hellofresh/kangal-ghz:local
3942
push: false
4043

4144
- name: Build dummy gRPC server Docker image
42-
uses: docker/build-push-action@v2
45+
uses: docker/build-push-action@v6
4346
with:
4447
tags: greeter_server:local
4548
file: ./testdata/Dockerfile
4649
context: ./testdata
4750
push: false
4851

4952
- name: Setup Kind
50-
uses: engineerd/setup-kind@v0.5.0
53+
uses: engineerd/setup-kind@v0.6.2
5154
with:
5255
version: "v0.11.1"
5356

5457
- name: Set up Helm
55-
uses: azure/setup-helm@v1
58+
uses: azure/setup-helm@v4
5659
with:
5760
version: v3.4.0
5861

5962
- name: Load docker images into kind cluster
6063
run: |
6164
kind load docker-image greeter_server:local
6265
kind load docker-image hellofresh/kangal-ghz:local
63-
66+
6467
- name: Kangal Integration Tests
6568
run: |
6669
./ci/integration-tests.sh

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,9 @@ A simple [`ghz`] docker image specifically configured for [Kangal].
44

55
[Kangal]: https://github.com/hellofresh/kangal/
66
[`ghz`]: https://github.com/bojand/ghz/
7+
8+
> [!WARNING]
9+
> Kangal's upload to DockerHub has been removed
10+
> We apologize for the disruption, but you can get the image from `ghcr.io/hellofresh/kangal-ghz` from January 31st 2026 onwards.
11+
>
12+
> The registry in DockerHub will not be available from February-onwards

0 commit comments

Comments
 (0)