Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BUMP] github actions #60

Merged
merged 4 commits into from
Aug 22, 2024
Merged

[BUMP] github actions #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7159fac
[INFRA] new php releases
mautz-et-tong Jun 12, 2024
f07ac12
[INFRA] bump libs and releases
mautz-et-tong Aug 22, 2024
f4682c7
[INFRA] update gitlab actions
mautz-et-tong Aug 22, 2024
6f86a50
[INFRA] update gitlab actions, fix new linting errors
mautz-et-tong Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/php-7.4.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@ jobs:
patchVersion: [33]
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
- name: Build php image
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
push: true
platforms: linux/amd64,linux/arm64
Expand All @@ -43,7 +43,7 @@ jobs:
build-args: |
PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }}
- name: Build toolbox image
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
push: true
platforms: linux/amd64,linux/arm64
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/php-8.0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@ jobs:
patchVersion: [30]
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
- name: Build php image
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
push: true
platforms: linux/amd64,linux/arm64
Expand All @@ -41,9 +41,9 @@ jobs:
file: ./src/${{ matrix.version }}/src/Dockerfile
target: php
build-args: |
PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }}
PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }}
- name: Build toolbox image
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
push: true
platforms: linux/amd64,linux/arm64
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/php-8.1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@ jobs:
strategy:
matrix:
version: ['8.1']
patchVersion: [23,24,25,26,27]
patchVersion: [24,25,26,27,28]
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
- name: Build php image
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
push: true
platforms: linux/amd64,linux/arm64
Expand All @@ -41,9 +41,9 @@ jobs:
file: ./src/${{ matrix.version }}/src/Dockerfile
target: php
build-args: |
PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }}
PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }}
- name: Build toolbox image
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
push: true
platforms: linux/amd64,linux/arm64
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/php-8.2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@ jobs:
strategy:
matrix:
version: ['8.2']
patchVersion: [14,15,16,17,18]
patchVersion: [17,18,19,20,21]
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
- name: Build php image
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
push: true
platforms: linux/amd64,linux/arm64
Expand All @@ -41,9 +41,9 @@ jobs:
file: ./src/${{ matrix.version }}/src/Dockerfile
target: php
build-args: |
PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }}
PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }}
- name: Build toolbox image
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
push: true
platforms: linux/amd64,linux/arm64
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/php-8.3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@ jobs:
strategy:
matrix:
version: ['8.3']
patchVersion: [2,3,4,5,6]
patchVersion: [5,6,7,8,9]
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
- name: Build php image
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
push: true
platforms: linux/amd64,linux/arm64
Expand All @@ -41,9 +41,9 @@ jobs:
file: ./src/${{ matrix.version }}/src/Dockerfile
target: php
build-args: |
PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }}
PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }}
- name: Build toolbox image
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
push: true
platforms: linux/amd64,linux/arm64
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
container: pipelinecomponents/hadolint:latest
steps:
- uses: actions/checkout@v2
- uses: hadolint/hadolint-action@v1.5.0
- uses: actions/checkout@v4
- uses: hadolint/hadolint-action@v3.1.0
with:
dockerfile: ./src/${{ matrix.version }}/src/Dockerfile
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ https://github.com/Imagick/imagick/tags
https://github.com/newrelic/newrelic-php-agent/releases

# Sample building for testing:
docker build -f src/7.4/src/Dockerfile -t docker.io/openmage/php:7.4.29 src/7.4/src/
docker build -f src/7.4/src/Dockerfile -t docker.io/openmage/php:8.3.6 src/8.3/src/

# Sample building for multi arch testing and push to docker hub:
cd src/8.3/src && docker buildx create --use && docker buildx build --progress=plain --platform linux/amd64,linux/arm64 --push -t docker.io/openmage/php:8.3.0 .
2 changes: 1 addition & 1 deletion src/7.4/src/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ RUN set -xe; \
docker-php-source extract; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
if [[ ! -d "/usr/include/curl" ]]; then \
if [ ! -d "/usr/include/curl" ]; then \
ln -sT "/usr/include/${debMultiarch}/curl" /usr/local/include/curl; \
fi; \
cd /usr/src/php; \
Expand Down
2 changes: 1 addition & 1 deletion src/8.0/src/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ RUN set -xe; \
docker-php-source extract; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
if [[ ! -d "/usr/include/curl" ]]; then \
if [ ! -d "/usr/include/curl" ]; then \
ln -sT "/usr/include/${debMultiarch}/curl" /usr/local/include/curl; \
fi; \
cd /usr/src/php; \
Expand Down
4 changes: 2 additions & 2 deletions src/8.1/src/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ARG PHP_PECL_REQUIREMENTS="redis igbinary"
ARG PHP_CONFIGURE_ARGS="--enable-soap --enable-intl"
ARG PHP_CONFIGURE_ARGS_EXTRA=""
ARG PHP_CONFIGURE_ARGS_FPM="--enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data"
ARG PHP_VERSION="8.1.25"
ARG PHP_VERSION="8.1.28"

ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
PHP_CPPFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
Expand Down Expand Up @@ -43,7 +43,7 @@ RUN set -xe; \
docker-php-source extract; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
if [[ ! -d "/usr/include/curl" ]]; then \
if [ ! -d "/usr/include/curl" ]; then \
ln -sT "/usr/include/${debMultiarch}/curl" /usr/local/include/curl; \
fi; \
cd /usr/src/php; \
Expand Down
4 changes: 2 additions & 2 deletions src/8.2/src/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ARG PHP_PECL_REQUIREMENTS="redis igbinary"
ARG PHP_CONFIGURE_ARGS="--enable-soap --enable-intl"
ARG PHP_CONFIGURE_ARGS_EXTRA=""
ARG PHP_CONFIGURE_ARGS_FPM="--enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data"
ARG PHP_VERSION="8.2.18"
ARG PHP_VERSION="8.2.21"

ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
PHP_CPPFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
Expand Down Expand Up @@ -43,7 +43,7 @@ RUN set -xe; \
docker-php-source extract; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
if [[ ! -d "/usr/include/curl" ]]; then \
if [ ! -d "/usr/include/curl" ]; then \
ln -sT "/usr/include/${debMultiarch}/curl" /usr/local/include/curl; \
fi; \
cd /usr/src/php; \
Expand Down
4 changes: 2 additions & 2 deletions src/8.3/src/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ARG PHP_PECL_REQUIREMENTS="redis igbinary"
ARG PHP_CONFIGURE_ARGS="--enable-soap --enable-intl"
ARG PHP_CONFIGURE_ARGS_EXTRA=""
ARG PHP_CONFIGURE_ARGS_FPM="--enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data"
ARG PHP_VERSION="8.3.6"
ARG PHP_VERSION="8.3.9"

ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
PHP_CPPFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
Expand Down Expand Up @@ -43,7 +43,7 @@ RUN set -xe; \
docker-php-source extract; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
if [[ ! -d "/usr/include/curl" ]]; then \
if [ ! -d "/usr/include/curl" ]; then \
ln -sT "/usr/include/${debMultiarch}/curl" /usr/local/include/curl; \
fi; \
cd /usr/src/php; \
Expand Down