Skip to content

Commit

Permalink
Lift base image (1.27.2) and PHP version (8.3)
Browse files Browse the repository at this point in the history
* Lift PHP 8.2 -> PHP 8.3
* Lift base image 1.25.3 -> 1.27.2
* Add package `telnet`.
  • Loading branch information
rintisch committed Oct 21, 2024
1 parent f6ec7be commit 16f8e45
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 25 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/docker_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,13 @@ jobs:
# See also https://docs.docker.com/docker-hub/builds/
push:
# Ensure test job passes before pushing image.
# needs: test

runs-on: ubuntu-latest
if: github.event_name == 'push'

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Build image
run: docker build . --file Dockerfile --tag $IMAGE_NAME
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [3.3.0] - 2024-10-21
### Added
* Add apt package `telnet`.

### Changed
- Lift to base image `nginx:1.27.2`.
- Lift PHP version from `8.2` to `8.3`.

## [3.2.0] - 2023-11-17
### Updated
* Update `nodejs` version which also contains `npm`
Expand Down
45 changes: 23 additions & 22 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Improved with https://hadolint.github.io/hadolint/
####################################################

FROM nginx:1.25.3
FROM nginx:1.27.2

ARG TOKEN
ARG ROOT_PATH=/var/www/html
Expand All @@ -16,7 +16,7 @@ ARG SUPERCRONIC_SHA1SUM=d7f4c0886eb85249ad05ed592902fa6865bb9d70

# Variables for supercronic, TYPO3, PHP
ENV TYPO3_CONTEXT=Production/Live \
PHP_INI_SCAN_DIR=/etc/php/8.2/fpm/conf.d
PHP_INI_SCAN_DIR=/etc/php/8.3/fpm/conf.d

# see https://github.com/hadolint/hadolint/wiki/DL4006
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
Expand All @@ -43,6 +43,7 @@ RUN apt-get update && \
openrc \
patch \
supervisor \
telnet \
tini \
unzip \
vim \
Expand All @@ -55,25 +56,25 @@ RUN apt-get update && \
echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/php.list && \
apt-get update && \
apt-get install --no-install-recommends --no-install-suggests -y \
php8.2 \
php8.2-apcu \
php8.2-cli \
php8.2-common \
php8.2-curl \
php8.2-dom \
php8.2-fpm \
php8.2-gd \
php8.2-intl \
php8.2-mbstring \
php8.2-mysql \
php8.2-opcache \
php8.2-pdo \
php8.2-pgsql \
php8.2-redis \
php8.2-sqlite3 \
php8.2-tokenizer \
php8.2-xml \
php8.2-zip && \
php8.3 \
php8.3-apcu \
php8.3-cli \
php8.3-common \
php8.3-curl \
php8.3-dom \
php8.3-fpm \
php8.3-gd \
php8.3-intl \
php8.3-mbstring \
php8.3-mysql \
php8.3-opcache \
php8.3-pdo \
php8.3-pgsql \
php8.3-redis \
php8.3-sqlite3 \
php8.3-tokenizer \
php8.3-xml \
php8.3-zip && \
# Install composer:
# Get it and hash; install if hash is verified; install globally; delete created install file
curl -sS https://getcomposer.org/installer -o composer-setup.php && \
Expand Down Expand Up @@ -106,7 +107,7 @@ RUN apt-get update && \
# remove cache
apt-get autoremove && apt-get clean && rm -rf /var/lib/apt/lists/*

# Directory /run/php is needed for php8.2-fpm.sock
# Directory /run/php is needed for php8.3-fpm.sock
RUN mkdir -p /run/php && \
# Directory /nonexistent which is needed for "composer config -g ..."
mkdir -p /nonexistent && \
Expand Down
Binary file modified README.md
Binary file not shown.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion etc/supervisord.conf
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ startretries=3
priority=1

[program:php-fpm]
command=php-fpm8.2 -F
command=php-fpm8.3 -F
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
Expand Down

0 comments on commit 16f8e45

Please sign in to comment.