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

SC-18357: Alpine 3.19 support. Update NewRelic Agent. Update PHP Vers… #84

Merged
merged 4 commits into from
Feb 1, 2024
Merged

SC-18357: Alpine 3.19 support. Update NewRelic Agent. Update PHP Vers… #84

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0dd372e
SC-18357: Alpine 3.19 support. Update NewRelic Agent. Update PHP Vers…
alexanderM91 Jan 31, 2024
9763ec7
SC-18357: Update NewRelic Agent
alexanderM91 Jan 31, 2024
87f7ed2
Update ReadMe
alexanderM91 Feb 1, 2024
0a301cc
Update ReadMe
alexanderM91 Feb 1, 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
21 changes: 10 additions & 11 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,6 @@ jobs:
matrix:
include:
## Alpine

### Alpine 3.15
- image: "alpine/3.15/8.0/Dockerfile"
tags: [ "spryker/php:8.0-alpine3.15" ]
platforms: [ "linux/amd64", "linux/arm64" ]
- image: "alpine/3.15/8.1/Dockerfile"
tags: [ "spryker/php:8.1-alpine3.15" ]
platforms: [ "linux/amd64", "linux/arm64" ]

### Alpine 3.16
- image: "alpine/3.16/8.0/Dockerfile"
tags: [ "spryker/php:8.0", "spryker/php:8.0-alpine3.16" ]
Expand All @@ -40,10 +31,18 @@ jobs:

### Alpine 3.18
- image: "alpine/3.18/8.1/Dockerfile"
tags: [ "spryker/php:8.1", "spryker/php:8.1-alpine3.18" ]
tags: [ "spryker/php:8.1-alpine3.18" ]
platforms: [ "linux/amd64", "linux/arm64" ]
- image: "alpine/3.18/8.2/Dockerfile"
tags: [ "spryker/php:latest", "spryker/php:8.2", "spryker/php:8.2-alpine3.18" ]
tags: [ "spryker/php:8.2-alpine3.18" ]
platforms: [ "linux/amd64", "linux/arm64" ]

### Alpine 3.19
- image: "alpine/3.19/8.1/Dockerfile"
tags: [ "spryker/php:8.1", "spryker/php:8.1-alpine3.19" ]
platforms: [ "linux/amd64", "linux/arm64" ]
- image: "alpine/3.19/8.2/Dockerfile"
tags: [ "spryker/php:latest", "spryker/php:8.2", "spryker/php:8.2-alpine3.19" ]
platforms: [ "linux/amd64", "linux/arm64" ]

## Debian
Expand Down
5 changes: 2 additions & 3 deletions alpine/3.16/8.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
# syntax = docker/dockerfile:1.0.2-experimental
ARG SPRYKER_PHP_VERSION=8.0.30
ARG NEWRELIC_VERSION=10.6.0.318

FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.16

ARG TARGETPLATFORM
ARG COMPOSER_VERSION=2.6.4
ARG COMPOSER_VERSION=2.6.6
ARG BLACKFIRE_VERSION=1.87.1
ARG BLACKFIRE_PHP_VERSION=80
ARG NEWRELIC_VERSION=10.11.0.3
ARG NEWRELIC_VERSION=10.16.0.5
ARG TIDEWAYS_VERSION=5.5.8
ARG TIDEWAYS_PHP_VERSION=8.0

Expand Down
6 changes: 3 additions & 3 deletions alpine/3.16/8.1/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# syntax = docker/dockerfile:1.0.2-experimental
ARG SPRYKER_PHP_VERSION=8.1.22
ARG SPRYKER_PHP_VERSION=8.1.26

FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.16

ARG TARGETPLATFORM
ARG COMPOSER_VERSION=2.6.4
ARG COMPOSER_VERSION=2.6.6
ARG BLACKFIRE_VERSION=1.87.1
ARG BLACKFIRE_PHP_VERSION=81
ARG NEWRELIC_VERSION=10.11.0.3
ARG NEWRELIC_VERSION=10.16.0.5
ARG TIDEWAYS_VERSION=5.5.8
ARG TIDEWAYS_PHP_VERSION=8.1

Expand Down
4 changes: 2 additions & 2 deletions alpine/3.16/8.2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ ARG SPRYKER_PHP_VERSION=8.2.5
FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.16

ARG TARGETPLATFORM
ARG COMPOSER_VERSION=2.6.4
ARG COMPOSER_VERSION=2.6.6
ARG BLACKFIRE_VERSION=1.87.1
ARG BLACKFIRE_PHP_VERSION=82
ARG NEWRELIC_VERSION=10.11.0.3
ARG NEWRELIC_VERSION=10.16.0.5
ARG TIDEWAYS_VERSION=5.5.14
ARG TIDEWAYS_PHP_VERSION=8.2

Expand Down
6 changes: 3 additions & 3 deletions alpine/3.17/8.1/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# syntax = docker/dockerfile:1.0.2-experimental
ARG SPRYKER_PHP_VERSION=8.1.22
ARG SPRYKER_PHP_VERSION=8.1.26

FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.17

ARG TARGETPLATFORM
ARG COMPOSER_VERSION=2.6.4
ARG COMPOSER_VERSION=2.6.6
ARG BLACKFIRE_VERSION=1.87.1
ARG BLACKFIRE_PHP_VERSION=81
ARG NEWRELIC_VERSION=10.11.0.3
ARG NEWRELIC_VERSION=10.16.0.5
ARG TIDEWAYS_VERSION=5.5.14
ARG TIDEWAYS_PHP_VERSION=8.1

Expand Down
6 changes: 3 additions & 3 deletions alpine/3.17/8.2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# syntax = docker/dockerfile:1.0.2-experimental
ARG SPRYKER_PHP_VERSION=8.2.9
ARG SPRYKER_PHP_VERSION=8.2.13

FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.17

ARG TARGETPLATFORM
ARG COMPOSER_VERSION=2.6.4
ARG COMPOSER_VERSION=2.6.6
ARG BLACKFIRE_VERSION=1.87.1
ARG BLACKFIRE_PHP_VERSION=82
ARG NEWRELIC_VERSION=10.11.0.3
ARG NEWRELIC_VERSION=10.16.0.5
ARG TIDEWAYS_VERSION=5.5.14
ARG TIDEWAYS_PHP_VERSION=8.2

Expand Down
6 changes: 3 additions & 3 deletions alpine/3.18/8.1/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# syntax = docker/dockerfile:1.0.2-experimental
ARG SPRYKER_PHP_VERSION=8.1.22
ARG SPRYKER_PHP_VERSION=8.1.27

FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.18

ARG TARGETPLATFORM
ARG COMPOSER_VERSION=2.6.4
ARG COMPOSER_VERSION=2.6.6
ARG BLACKFIRE_VERSION=1.87.1
ARG BLACKFIRE_PHP_VERSION=81
ARG NEWRELIC_VERSION=10.11.0.3
ARG NEWRELIC_VERSION=10.16.0.5
ARG TIDEWAYS_VERSION=5.5.14
ARG TIDEWAYS_PHP_VERSION=8.1

Expand Down
6 changes: 3 additions & 3 deletions alpine/3.18/8.2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# syntax = docker/dockerfile:1.0.2-experimental
ARG SPRYKER_PHP_VERSION=8.2.9
ARG SPRYKER_PHP_VERSION=8.2.15

FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.18

ARG TARGETPLATFORM
ARG COMPOSER_VERSION=2.6.4
ARG COMPOSER_VERSION=2.6.6
ARG BLACKFIRE_VERSION=1.87.1
ARG BLACKFIRE_PHP_VERSION=82
ARG NEWRELIC_VERSION=10.11.0.3
ARG NEWRELIC_VERSION=10.16.0.5
ARG TIDEWAYS_VERSION=5.5.14
ARG TIDEWAYS_PHP_VERSION=8.2

Expand Down
31 changes: 22 additions & 9 deletions alpine/3.15/8.1/Dockerfile → alpine/3.19/8.1/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# syntax = docker/dockerfile:1.0.2-experimental
ARG SPRYKER_PHP_VERSION=8.1.13
ARG SPRYKER_PHP_VERSION=8.1.27

FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.15
FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.19

ARG TARGETPLATFORM
ARG COMPOSER_VERSION=2.6.4
ARG COMPOSER_VERSION=2.6.6
ARG BLACKFIRE_VERSION=1.87.1
ARG BLACKFIRE_PHP_VERSION=81
ARG NEWRELIC_VERSION=10.11.0.3
ARG TIDEWAYS_VERSION=5.5.8
ARG NEWRELIC_VERSION=10.16.0.5
ARG TIDEWAYS_VERSION=5.5.14
ARG TIDEWAYS_PHP_VERSION=8.1

ENV srcRoot /data
Expand Down Expand Up @@ -37,6 +37,7 @@ ARG PHP_BUILD_DEPS="\
freetype-dev \
gmp-dev \
icu-dev \
icu-data-full \
libjpeg-turbo-dev \
libpng-dev \
libwebp-dev \
Expand Down Expand Up @@ -70,6 +71,9 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\
xdebug \
xhprof"

ARG GRAPHVIZ_BUILD_DEPS="\
expat-dev"

ARG CFLAGS="-I/usr/src/php"
RUN apk update \
&& apk upgrade \
Expand All @@ -79,12 +83,10 @@ RUN apk update \
curl \
g++ \
git \
graphviz \
make \
mysql-client \
netcat-openbsd \
openssh \
openssl \
postgresql-client \
procps \
python3 \
Expand All @@ -94,6 +96,8 @@ RUN apk update \
${PHP_RUN_DEPS} \
&& \
apk add --no-cache --virtual .php-build-deps ${PHP_BUILD_DEPS} \
&& \
apk add --no-cache --virtual .graphviz-build-deps ${GRAPHVIZ_BUILD_DEPS} \
&& rm -rf /var/lib/apt/lists/ \
&& \
docker-php-ext-configure gd \
Expand Down Expand Up @@ -133,8 +137,7 @@ RUN bash -c 'curl -L "https://download.newrelic.com/php_agent/archive/${NEWRELIC
&& /tmp/newrelic-php5-*/newrelic-install install \
&& rm -rf /tmp/newrelic-php5-* /tmp/nrinstall* \
&& /usr/bin/install -d -m 777 /var/log/newrelic/ \
&& rm /usr/local/etc/php/conf.d/newrelic.ini \
&& ln -s /lib64/ld-linux-x86-64.so.2 /lib/ld-linux-x86-64.so.2'
&& rm /usr/local/etc/php/conf.d/newrelic.ini'

# Tideways
ENV TIDEWAYS_APIKEY=''
Expand All @@ -150,6 +153,16 @@ RUN bash -c 'if [ "${TARGETPLATFORM}" == "linux/arm64" ]; then \
&& tar xvzf tideways-php-${TIDEWAYS_VERSION}-alpine-arm64.tar.gz \
&& cp ./build/dist/tideways-php-alpine-${TIDEWAYS_PHP_VERSION}.so $(php-config --extension-dir)/tideways.so; fi'

# GraphViz 7.0.5
RUN cd /tmp && \
curl -L https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/7.0.5/graphviz-7.0.5.tar.gz | tar -zx && \
cd /tmp/graphviz-7.0.5 && \
./configure && \
make && \
make install && \
rm -rf /tmp/graphviz-7.0.5 && \
apk del --no-cache .graphviz-build-deps

# Opcache
RUN /usr/bin/install -d -m 777 /var/run/opcache

Expand Down
36 changes: 24 additions & 12 deletions alpine/3.15/8.0/Dockerfile → alpine/3.19/8.2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# syntax = docker/dockerfile:1.0.2-experimental
ARG SPRYKER_PHP_VERSION=8.0.26
ARG SPRYKER_PHP_VERSION=8.2.15

FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.15
FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.19

ARG TARGETPLATFORM
ARG COMPOSER_VERSION=2.6.4
ARG COMPOSER_VERSION=2.6.6
ARG BLACKFIRE_VERSION=1.87.1
ARG BLACKFIRE_PHP_VERSION=80
ARG NEWRELIC_VERSION=10.11.0.3
ARG TIDEWAYS_VERSION=5.5.8
ARG TIDEWAYS_PHP_VERSION=8.0
ARG BLACKFIRE_PHP_VERSION=82
ARG NEWRELIC_VERSION=10.16.0.5
ARG TIDEWAYS_VERSION=5.5.14
ARG TIDEWAYS_PHP_VERSION=8.2

ENV srcRoot /data

Expand Down Expand Up @@ -37,6 +37,7 @@ ARG PHP_BUILD_DEPS="\
freetype-dev \
gmp-dev \
icu-dev \
icu-data-full \
libjpeg-turbo-dev \
libpng-dev \
libwebp-dev \
Expand Down Expand Up @@ -70,6 +71,9 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\
xdebug \
xhprof"

ARG GRAPHVIZ_BUILD_DEPS="\
expat-dev"

ARG CFLAGS="-I/usr/src/php"
RUN apk update \
&& apk upgrade \
Expand All @@ -79,22 +83,21 @@ RUN apk update \
curl \
g++ \
git \
graphviz \
make \
mysql-client \
netcat-openbsd \
openssh \
openssl \
postgresql-client \
procps \
python3 \
shadow \
make \
unzip \
linux-headers \
${PHP_RUN_DEPS} \
&& \
apk add --no-cache --virtual .php-build-deps ${PHP_BUILD_DEPS} \
&& \
apk add --no-cache --virtual .graphviz-build-deps ${GRAPHVIZ_BUILD_DEPS} \
&& rm -rf /var/lib/apt/lists/ \
&& \
docker-php-ext-configure gd \
Expand Down Expand Up @@ -134,8 +137,7 @@ RUN bash -c 'curl -L "https://download.newrelic.com/php_agent/archive/${NEWRELIC
&& /tmp/newrelic-php5-*/newrelic-install install \
&& rm -rf /tmp/newrelic-php5-* /tmp/nrinstall* \
&& /usr/bin/install -d -m 777 /var/log/newrelic/ \
&& rm /usr/local/etc/php/conf.d/newrelic.ini \
&& ln -s /lib64/ld-linux-x86-64.so.2 /lib/ld-linux-x86-64.so.2'
&& rm /usr/local/etc/php/conf.d/newrelic.ini'

# Tideways
ENV TIDEWAYS_APIKEY=''
Expand All @@ -151,6 +153,16 @@ RUN bash -c 'if [ "${TARGETPLATFORM}" == "linux/arm64" ]; then \
&& tar xvzf tideways-php-${TIDEWAYS_VERSION}-alpine-arm64.tar.gz \
&& cp ./build/dist/tideways-php-alpine-${TIDEWAYS_PHP_VERSION}.so $(php-config --extension-dir)/tideways.so; fi'

# GraphViz 7.0.5
RUN cd /tmp && \
curl -L https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/7.0.5/graphviz-7.0.5.tar.gz | tar -zx && \
cd /tmp/graphviz-7.0.5 && \
./configure && \
make && \
make install && \
rm -rf /tmp/graphviz-7.0.5 && \
apk del --no-cache .graphviz-build-deps

# Opcache
RUN /usr/bin/install -d -m 777 /var/run/opcache

Expand Down
4 changes: 2 additions & 2 deletions debian/bullseye/8.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ ARG SPRYKER_PHP_VERSION=8.0.28
FROM php:${SPRYKER_PHP_VERSION}-fpm-bullseye

ARG TARGETPLATFORM
ARG COMPOSER_VERSION=2.6.4
ARG COMPOSER_VERSION=2.6.6
ARG BLACKFIRE_VERSION=1.87.1
ARG BLACKFIRE_PHP_VERSION=80
ARG NEWRELIC_VERSION=10.11.0.3
ARG NEWRELIC_VERSION=10.16.0.5
ARG TIDEWAYS_VERSION=5.5.8
ARG TIDEWAYS_PHP_VERSION=8.0
ARG GOLANG_VERSION=1.20.3
Expand Down
4 changes: 2 additions & 2 deletions debian/bullseye/8.1/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ ARG SPRYKER_PHP_VERSION=8.1.18
FROM php:${SPRYKER_PHP_VERSION}-fpm-bullseye

ARG TARGETPLATFORM
ARG COMPOSER_VERSION=2.6.4
ARG COMPOSER_VERSION=2.6.6
ARG BLACKFIRE_VERSION=1.87.1
ARG BLACKFIRE_PHP_VERSION=81
ARG NEWRELIC_VERSION=10.11.0.3
ARG NEWRELIC_VERSION=10.16.0.5
ARG TIDEWAYS_VERSION=5.5.8
ARG TIDEWAYS_PHP_VERSION=8.1
ARG GOLANG_VERSION=1.20.3
Expand Down
4 changes: 2 additions & 2 deletions debian/bullseye/8.2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ ARG SPRYKER_PHP_VERSION=8.2.5
FROM php:${SPRYKER_PHP_VERSION}-fpm-bullseye

ARG TARGETPLATFORM
ARG COMPOSER_VERSION=2.6.4
ARG COMPOSER_VERSION=2.6.6
ARG BLACKFIRE_VERSION=1.87.1
ARG BLACKFIRE_PHP_VERSION=82
ARG NEWRELIC_VERSION=10.11.0.3
ARG NEWRELIC_VERSION=10.16.0.5
ARG TIDEWAYS_VERSION=5.5.14
ARG TIDEWAYS_PHP_VERSION=8.2
ARG GOLANG_VERSION=1.20.3
Expand Down
Loading