Skip to content

Commit

Permalink
phalcon#16477 - Remove PHP7.4 docker image and add PHP8.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeckerson committed Dec 23, 2023
1 parent 078c41e commit e402b0c
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 26 deletions.
16 changes: 8 additions & 8 deletions docker-compose-local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@
version: '3'

services:
cphalcon-7.4:
container_name: cphalcon-7.4
hostname: cphalcon-74
build: docker/7.4
working_dir: /srv
volumes:
- .:/srv

cphalcon-8.0:
container_name: cphalcon-8.0
hostname: cphalcon-80
Expand All @@ -35,6 +27,14 @@ services:
volumes:
- .:/srv

cphalcon-8.3:
container_name: cphalcon-8.3
hostname: cphalcon-83
build: docker/8.3
working_dir: /srv
volumes:
- .:/srv

mysql:
container_name: cphalcon-mysql
image: mysql:5.7
Expand Down
18 changes: 10 additions & 8 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@
version: '3'

services:
cphalcon-7.4:
container_name: cphalcon-7.4
hostname: cphalcon-74
build: docker/7.4
working_dir: /srv
volumes:
- .:/srv

cphalcon-8.0:
container_name: cphalcon-8.0
hostname: cphalcon-80
Expand All @@ -24,6 +16,8 @@ services:
hostname: cphalcon-81
build: docker/8.1
working_dir: /srv
ports:
- "9501:9501"
volumes:
- .:/srv

Expand All @@ -35,6 +29,14 @@ services:
volumes:
- .:/srv

cphalcon-8.3:
container_name: cphalcon-8.3
hostname: cphalcon-83
build: docker/8.3
working_dir: /srv
volumes:
- .:/srv

mysql:
container_name: cphalcon-mysql
image: mysql:5.7
Expand Down
File renamed without changes.
24 changes: 14 additions & 10 deletions docker/7.4/Dockerfile → docker/8.3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM composer:latest as composer
FROM php:7.4-fpm
FROM php:8.3-fpm

ADD ./extra.ini /usr/local/etc/php/conf.d/

Expand All @@ -8,7 +8,7 @@ ENV MY_USER="phalcon" \
MY_GROUP="phalcon" \
MY_UID="1000" \
MY_GID="1000" \
PHP_VERSION="7.4" \
PHP_VERSION="8.3" \
LANG=en_US.UTF-8 \
LANGUAGE=en_US.UTF-8 \
LC_ALL=en_US.UTF-8
Expand Down Expand Up @@ -38,17 +38,22 @@ RUN apt update -y && \
nano \
sudo \
wget \
zip \
zlib1g
zip

# Remove this RUN when imagick will be available via pecl
RUN cd /opt && \
git clone https://github.com/Imagick/imagick.git && \
cd imagick && \
phpize && ./configure && \
make && make install

# PECL Packages
RUN pecl install \
redis \
igbinary \
RUN pecl install -o -f redis && \
pecl install igbinary \
msgpack \
apcu \
yaml \
imagick \
# imagick \
memcached \
zephir_parser

Expand Down Expand Up @@ -79,12 +84,11 @@ RUN docker-php-ext-install \

# Install PHP extensions
RUN docker-php-ext-enable \
gettext \
redis \
igbinary \
msgpack \
apcu \
imagick \
# imagick \
yaml \
memcached \
zephir_parser
Expand Down
File renamed without changes.

0 comments on commit e402b0c

Please sign in to comment.