Skip to content

Commit 235ed04

Browse files
author
Andreas Mautz
authored
Merge pull request #6 from wilma-digital/main
[INFRA] remove buster from supported debian versions
2 parents 888e69e + e92f859 commit 235ed04

18 files changed

+18
-918
lines changed

.github/workflows/main.yml

+8-7
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,32 @@ name: "Build on main"
22
on:
33
workflow_dispatch:
44
push:
5-
branches: [ main ]
5+
branches:
6+
- main
67

78
jobs:
89
scheduler:
910
name: Build Trigger
1011
runs-on: ubuntu-latest
1112
strategy:
1213
matrix:
13-
version: [ 'buster', 'bullseye', 'bookworm' ]
14+
version: [ 'bullseye', 'bookworm' ]
1415
steps:
1516
- name: Checkout
16-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1718
- name: Set up QEMU
18-
uses: docker/setup-qemu-action@v1
19+
uses: docker/setup-qemu-action@v3
1920
- name: Set up Docker Buildx
2021
id: buildx
21-
uses: docker/setup-buildx-action@v1
22+
uses: docker/setup-buildx-action@v3
2223
- name: Login to DockerHub
23-
uses: docker/login-action@v1
24+
uses: docker/login-action@v3
2425
with:
2526
username: ${{ secrets.DOCKER_HUB_USERNAME }}
2627
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
2728
- name: Build and push
2829
id: docker_build
29-
uses: docker/build-push-action@v2
30+
uses: docker/build-push-action@v6
3031
with:
3132
push: true
3233
platforms: linux/amd64,linux/arm64

.github/workflows/pull_request.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
lint:
99
strategy:
1010
matrix:
11-
version: [ 'buster', 'bullseye', 'bookworm' ]
11+
version: [ 'bullseye', 'bookworm' ]
1212
runs-on: ubuntu-latest
1313
container: pipelinecomponents/hadolint:latest
1414
steps:
15-
- uses: actions/checkout@v2
16-
- uses: hadolint/hadolint-action@v1.5.0
15+
- uses: actions/checkout@v4
16+
- uses: hadolint/hadolint-action@v3.1.0
1717
with:
1818
dockerfile: ./src/${{ matrix.version }}/src/Dockerfile

.github/workflows/schedule.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
version: [ 'buster', 'bullseye', 'bookworm' ]
13+
version: [ 'bullseye', 'bookworm' ]
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v4
1717
- name: Set up QEMU
18-
uses: docker/setup-qemu-action@v1
18+
uses: docker/setup-qemu-action@v3
1919
- name: Set up Docker Buildx
2020
id: buildx
21-
uses: docker/setup-buildx-action@v1
21+
uses: docker/setup-buildx-action@v3
2222
- name: Login to DockerHub
23-
uses: docker/login-action@v1
23+
uses: docker/login-action@v3
2424
with:
2525
username: ${{ secrets.DOCKER_HUB_USERNAME }}
2626
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
2727
- name: Build and push
2828
id: docker_build
29-
uses: docker/build-push-action@v2
29+
uses: docker/build-push-action@v6
3030
with:
3131
push: true
3232
platforms: linux/amd64,linux/arm64

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# PHP Base Image (WIP)
22

3-
This Repo contains the build instructions for the PHP base image (Stretch and Buster). All PHP images should inherit from this image.
3+
This Repo contains the build instructions for the PHP base image (bullseye and bookworm). All PHP images should inherit from this image.
44

55
## Documentation
66

src/buster/src/Dockerfile

-124
This file was deleted.

src/buster/src/root/etc/apt/preferences.d/debian_main_cmake

-3
This file was deleted.

src/buster/src/root/etc/php-src

-2
This file was deleted.

src/buster/src/root/usr/local/bin/docker-entrypoint

-60
This file was deleted.

0 commit comments

Comments
 (0)