Skip to content

Commit

Permalink
Upgrade to PHP v8.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
zebby76 committed Jan 9, 2025
1 parent 59749d0 commit 46400d4
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .build.env
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
DOCKER_IMAGE_NAME=docker.io/elasticms/base-php

# Default PHP Version
PHP_VERSION=8.4.1
PHP_VERSION=8.4.2

# Default Versions
NODE_VERSION=20
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/Dockerfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG COMPOSER_VERSION_ARG

FROM composer:${COMPOSER_VERSION_ARG:-2.8.4} AS composer
FROM node:${NODE_VERSION_ARG:-20}-alpine3.21 AS node
FROM php:${VERSION_ARG:-8.4.1}-fpm-alpine3.21 AS fpm-prd
FROM php:${VERSION_ARG:-8.4.2}-fpm-alpine3.21 AS fpm-prd

# include(fpm-prd.m4)

Expand All @@ -29,7 +29,7 @@ FROM fpm-dev AS nginx-dev

# include(nginx.m4)

FROM php:${VERSION_ARG:-8.4.1}-cli-alpine3.21 AS cli-prd
FROM php:${VERSION_ARG:-8.4.2}-cli-alpine3.21 AS cli-prd

# include(cli-prd.m4)

Expand Down
38 changes: 19 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,49 +45,49 @@ Default value of Docker build arguments is grabbed from the [.build.env](.build.
## Example building __fpm__ variant __prd__ Docker image

```sh
make build-fpm PHP_VERSION=8.4.1
make build-fpm PHP_VERSION=8.4.2
```

__Provide docker image__ : `docker.io/elasticms/base-php:8.4.1-fpm-prd`
__Provide docker image__ : `docker.io/elasticms/base-php:8.4.2-fpm-prd`

```sh
make build-fpm PHP_VERSION=8.4.1 DOCKER_IMAGE_NAME=docker.io/lambdauser/mybasephpimage
make build-fpm PHP_VERSION=8.4.2 DOCKER_IMAGE_NAME=docker.io/lambdauser/mybasephpimage
```

__Provide docker image__ : `docker.io/lambdauser/mybasephpimage:8.4.1-fpm-prd`
__Provide docker image__ : `docker.io/lambdauser/mybasephpimage:8.4.2-fpm-prd`

## Example building __fpm__ variant __dev__ Docker image

```sh
make build-fpm-dev PHP_VERSION=8.4.1
make build-fpm-dev PHP_VERSION=8.4.2
```

__Provide docker image__ : `docker.io/elasticms/base-php:8.4.1-fpm-dev`
__Provide docker image__ : `docker.io/elasticms/base-php:8.4.2-fpm-dev`

## Example building __nginx__ variant __dev__ Docker image

```sh
make build-nginx-dev PHP_VERSION=8.4.1
make build-nginx-dev PHP_VERSION=8.4.2
```

__Provide docker image__ : `docker.io/elasticms/base-php:8.4.1-nginx-dev`
__Provide docker image__ : `docker.io/elasticms/base-php:8.4.2-nginx-dev`

## Example building __all__ variants Docker image

```sh
make build-all PHP_VERSION=8.4.1
make build-all PHP_VERSION=8.4.2
```

__Provide docker images__ :

- `docker.io/elasticms/base-php:8.4.1-fpm-prd`
- `docker.io/elasticms/base-php:8.4.1-fpm-dev`
- `docker.io/elasticms/base-php:8.4.1-apache-prd`
- `docker.io/elasticms/base-php:8.4.1-apache-dev`
- `docker.io/elasticms/base-php:8.4.1-nginx-prd`
- `docker.io/elasticms/base-php:8.4.1-nginx-dev`
- `docker.io/elasticms/base-php:8.4.1-cli-prd`
- `docker.io/elasticms/base-php:8.4.1-cli-dev`
- `docker.io/elasticms/base-php:8.4.2-fpm-prd`
- `docker.io/elasticms/base-php:8.4.2-fpm-dev`
- `docker.io/elasticms/base-php:8.4.2-apache-prd`
- `docker.io/elasticms/base-php:8.4.2-apache-dev`
- `docker.io/elasticms/base-php:8.4.2-nginx-prd`
- `docker.io/elasticms/base-php:8.4.2-nginx-dev`
- `docker.io/elasticms/base-php:8.4.2-cli-prd`
- `docker.io/elasticms/base-php:8.4.2-cli-dev`
# Test

## Prerequisite
Expand All @@ -103,13 +103,13 @@ make test[-fpm|-apache|-nginx|-cli|-all][-dev] PHP_VERSION=<PHP Version you want
## Example testing of __prd__ builded docker image

```sh
make test PHP_VERSION=8.4.1
make test PHP_VERSION=8.4.2
```

## Example testing of __dev__ builded docker image

```sh
make test-dev PHP_VERSION=8.4.1
make test-dev PHP_VERSION=8.4.2
```

# Releases
Expand Down
2 changes: 1 addition & 1 deletion test/tests.cli.bats
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ load "helpers/dataloaders"
load "lib/batslib"
load "lib/output"

export BATS_PHP_VERSION="${PHP_VERSION:-8.4.1}"
export BATS_PHP_VERSION="${PHP_VERSION:-8.4.2}"
export BATS_AWS_CLI_VERSION="${AWS_CLI_VERSION:-2.22.10}"

export BATS_PHP_DOCKER_IMAGE_NAME="${DOCKER_IMAGE_NAME:-docker.io/elasticms/base-php:8.4-cli}"
Expand Down

0 comments on commit 46400d4

Please sign in to comment.