Skip to content

Commit 7b2e7e9

Browse files
committed
Add 17, deprecate 12
1 parent b721dda commit 7b2e7e9

File tree

4 files changed

+33
-22
lines changed

4 files changed

+33
-22
lines changed

.github/workflows/build.yml

+9-6
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ jobs:
1212
strategy:
1313
matrix:
1414
include:
15-
- distro: alpine
16-
version: "12-alpine"
17-
1815
- distro: alpine
1916
version: "13-alpine"
2017

@@ -27,8 +24,8 @@ jobs:
2724
- distro: alpine
2825
version: "16-alpine"
2926

30-
- distro: debian
31-
version: "12"
27+
- distro: alpine
28+
version: "17-alpine"
3229

3330
- distro: debian
3431
version: "13"
@@ -42,6 +39,9 @@ jobs:
4239
- distro: debian
4340
version: "16"
4441

42+
- distro: debian
43+
version: "17"
44+
4545
- distro: debian
4646
version: latest
4747
steps:
@@ -53,7 +53,10 @@ jobs:
5353
--tag ${{ env.IMAGE }}:${{ matrix.version }}
5454
.
5555

56+
- name: Install Docker Compose
57+
uses: withlogicco/setup-compose-cli@v1
58+
5659
- name: Test alpine image
5760
env:
5861
IMAGE: ${{ env.IMAGE }}:${{ matrix.version }}
59-
run: docker-compose -f docker-compose.test.yml run sut
62+
run: docker compose -f docker-compose.test.yml run sut

.github/workflows/dockerhub.yml

+10-7
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ jobs:
2222
strategy:
2323
matrix:
2424
include:
25-
- distro: alpine
26-
version: "12-alpine"
27-
2825
- distro: alpine
2926
version: "13-alpine"
3027

@@ -35,10 +32,10 @@ jobs:
3532
version: "15-alpine"
3633

3734
- distro: alpine
38-
version: "15-alpine"
35+
version: "16-alpine"
3936

40-
- distro: debian
41-
version: "12"
37+
- distro: alpine
38+
version: "17-alpine"
4239

4340
- distro: debian
4441
version: "13"
@@ -52,6 +49,9 @@ jobs:
5249
- distro: debian
5350
version: "16"
5451

52+
- distro: debian
53+
version: "17"
54+
5555
- distro: debian
5656
version: latest
5757
steps:
@@ -64,10 +64,13 @@ jobs:
6464
--tag ${{ env.IMAGE }}:${{ matrix.version }}
6565
.
6666

67+
- name: Install Docker Compose
68+
uses: withlogicco/setup-compose-cli@v1
69+
6770
- name: Test alpine image
6871
env:
6972
IMAGE: ${{ env.IMAGE }}:${{ matrix.version }}
70-
run: docker-compose -f docker-compose.test.yml run sut
73+
run: docker compose -f docker-compose.test.yml run sut
7174

7275
# if we get here, the test passed, so let's buildx and push
7376
- name: Log in to the container registry

.github/workflows/ghcr.yml

+9-6
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ jobs:
2323
strategy:
2424
matrix:
2525
include:
26-
- distro: alpine
27-
version: "12-alpine"
28-
2926
- distro: alpine
3027
version: "13-alpine"
3128

@@ -38,8 +35,8 @@ jobs:
3835
- distro: alpine
3936
version: "16-alpine"
4037

41-
- distro: debian
42-
version: "12"
38+
- distro: alpine
39+
version: "17-alpine"
4340

4441
- distro: debian
4542
version: "13"
@@ -53,6 +50,9 @@ jobs:
5350
- distro: debian
5451
version: "16"
5552

53+
- distro: debian
54+
version: "17"
55+
5656
- distro: debian
5757
version: latest
5858
steps:
@@ -65,10 +65,13 @@ jobs:
6565
--tag ${{ env.IMAGE }}:${{ matrix.version }}
6666
.
6767

68+
- name: Install Docker Compose
69+
uses: withlogicco/setup-compose-cli@v1
70+
6871
- name: Test alpine image
6972
env:
7073
IMAGE: ${{ env.IMAGE }}:${{ matrix.version }}
71-
run: docker-compose -f docker-compose.test.yml run sut
74+
run: docker compose -f docker-compose.test.yml run sut
7275

7376
# if we get here, the test passed, so let's buildx and push
7477
- name: Log in to the container registry

Makefile

+5-3
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,20 @@ versions = \
44
alpine
55

66
alpine_tags = \
7-
11-alpine \
87
12-alpine \
98
13-alpine \
109
14-alpine \
10+
15-alpine \
11+
16-alpine \
1112
15-alpine
1213

1314
debian_tags = \
14-
11-bullseye \
1515
12 \
1616
13 \
1717
14 \
18-
15
18+
15 \
19+
16 \
20+
17
1921

2022
all: $(alpine_tags) $(debian_tags)
2123

0 commit comments

Comments
 (0)