Skip to content

Commit 349f89b

Browse files
author
Andreas Mautz
committed
[INFRA] remove stretch, add multiarch
1 parent 0ef1a57 commit 349f89b

16 files changed

+14
-902
lines changed

.github/workflows/main.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,15 @@ jobs:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
version: [ 'buster', 'stretch', 'bullseye' ]
12+
version: [ 'buster', 'bullseye' ]
1313
steps:
1414
- name: Checkout
1515
uses: actions/checkout@v2
16+
- name: Set up QEMU
17+
uses: docker/setup-qemu-action@v1
18+
- name: Set up Docker Buildx
19+
id: buildx
20+
uses: docker/setup-buildx-action@v1
1621
- name: Login to DockerHub
1722
uses: docker/login-action@v1
1823
with:
@@ -23,6 +28,7 @@ jobs:
2328
uses: docker/build-push-action@v2
2429
with:
2530
push: true
31+
platforms: linux/amd64,linux/arm64
2632
tags: openmage/php-base:${{ matrix.version }}-latest
2733
context: ./src/${{ matrix.version }}/src
2834
file: ./src/${{ matrix.version }}/src/Dockerfile

.github/workflows/schedule.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,15 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
version: [ 'buster', 'stretch', 'bullseye' ]
13+
version: [ 'buster', 'bullseye' ]
1414
steps:
1515
- name: Checkout
1616
uses: actions/checkout@v2
17+
- name: Set up QEMU
18+
uses: docker/setup-qemu-action@v1
19+
- name: Set up Docker Buildx
20+
id: buildx
21+
uses: docker/setup-buildx-action@v1
1722
- name: Login to DockerHub
1823
uses: docker/login-action@v1
1924
with:
@@ -24,6 +29,7 @@ jobs:
2429
uses: docker/build-push-action@v2
2530
with:
2631
push: true
32+
platforms: linux/amd64,linux/arm64
2733
tags: openmage/php-base:${{ matrix.version }}-latest
2834
context: ./src/${{ matrix.version }}/src
2935
file: ./src/${{ matrix.version }}/src/Dockerfile

src/stretch/src/Dockerfile

-123
This file was deleted.

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

-3
This file was deleted.

src/stretch/src/root/etc/php-src

-2
This file was deleted.

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

-60
This file was deleted.

src/stretch/src/root/usr/local/bin/docker-fpm-healthcheck

-138
This file was deleted.

0 commit comments

Comments
 (0)