Skip to content

Commit d2e4158

Browse files
committed
[8.3] remove newrelic + gha cache
1 parent 416f879 commit d2e4158

File tree

3 files changed

+6
-34
lines changed

3 files changed

+6
-34
lines changed

.github/workflows/php-83.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,15 @@ jobs:
2020
tags: |
2121
jopplt/php:8.3-fpm-base
2222
build-args: |
23-
COMPOSER_VERSION=2.7.1
23+
COMPOSER_VERSION=2.7.7
2424
platforms: linux/amd64,linux/arm64
25-
- name: "[8.3][newrelic]"
26-
target: "newrelic"
27-
context: 8.3
28-
tags: |
29-
jopplt/php:8.3-fpm-newrelic
30-
build-args: |
31-
NEW_RELIC_AGENT_VERSION=10.18.0.8
32-
platforms: linux/amd64
3325
- name: "[8.3][dev]"
3426
target: "dev"
3527
context: 8.3
3628
tags: |
3729
jopplt/php:8.3-fpm-dev
3830
build-args: |
39-
COMPOSER_VERSION=2.7.1
31+
COMPOSER_VERSION=2.7.7
4032
platforms: linux/amd64,linux/arm64
4133
fail-fast: true
4234
runs-on: ubuntu-22.04
@@ -55,12 +47,14 @@ jobs:
5547
username: ${{ secrets.DOCKER_USERNAME }}
5648
password: ${{ secrets.DOCKER_PASSWORD }}
5749
- name: "${{ matrix.image.name }}"
58-
uses: docker/build-push-action@v2
50+
uses: docker/build-push-action@v6
5951
with:
6052
builder: ${{ steps.buildx.outputs.name }}
6153
context: ${{ matrix.image.context }}
6254
target: ${{ matrix.image.target }}
6355
platforms: ${{ matrix.image.platforms }}
6456
push: true
6557
tags: ${{ matrix.image.tags }}
66-
build-args: ${{ matrix.image.build-args }}
58+
build-args: ${{ matrix.image.build-args }}
59+
cache-from: type=gha
60+
cache-to: type=gha,mode=max

8.3/Dockerfile

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,6 @@ RUN apk --update add --no-cache --virtual .build-deps \
3333
# Cleanup
3434
&& apk del .build-deps
3535

36-
FROM base AS newrelic
37-
ARG NEW_RELIC_AGENT_VERSION=10.21.0.11
38-
ARG NR_INSTALL_USE_CP_NOT_LN=1
39-
ARG NR_INSTALL_SILENT=1
40-
RUN apk --update add --no-cache libstdc++ gcompat
41-
RUN curl -L https://download.newrelic.com/php_agent/archive/${NEW_RELIC_AGENT_VERSION}/newrelic-php5-${NEW_RELIC_AGENT_VERSION}-linux-musl.tar.gz | tar -C $HOME -zx \
42-
&& $HOME/newrelic-php5-${NEW_RELIC_AGENT_VERSION}-linux-musl/newrelic-install install \
43-
&& rm -rf $HOME/newrelic-php5-* $HOME/nrinstall*
44-
4536
FROM base AS dev
4637
COPY config/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
4738
RUN apk --update add --no-cache --virtual .build-deps \

README.md

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,6 @@ Custom `xdebug.ini` configuration?:
5858
docker run --rm -it -v ${PWD}:/app -v ${PWD}/config/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini jopplt/php:8.3-fpm-dev bash
5959
```
6060

61-
### `8.3-fpm-newrelic`: PHP 8.3 fpm with Newrelic Agent
62-
```
63-
docker pull jopplt/php:8.3-fpm-newrelic
64-
```
65-
66-
Requirements:
67-
* Newrelic daemon running in a separate container. Please refer to [docs.newrelic.com](https://docs.newrelic.com/docs/apm/agents/php-agent/advanced-installation/docker-other-container-environments-install-php-agent/) for more information
68-
* `newrelic.ini` configuration
69-
70-
```
71-
docker run -d -v ${PWD}:/app -v ${PWD}/config/newrelic.ini:/usr/local/etc/php/conf.d/newrelic.ini jopplt/php:8.3-fpm-newrelic
72-
```
73-
7461
## Local build & run
7562

7663
```

0 commit comments

Comments
 (0)