Revert "minor changes to the docker files"

This reverts commit 65bdac1.

Author: niden

.github/workflows/main.yml

@@ -86,16 +86,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php:
-          - '8.1'
-          - '8.2'
-          - '8.3'
-          - '8.4'
-        ts:
-          - 'nts'
-          - 'ts'
-        arch:
-          - 'x64'
+        php: [ '8.1', '8.2', '8.3', '8.4' ]
+        ts: [ 'nts', 'ts' ]
+        arch: [ 'x64' ]
 
         name:
           - ubuntu-gcc
@@ -277,11 +270,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php:
-          - '8.1'
-          - '8.2'
-          - '8.3'
-          - '8.4'
+        php: [ '8.1', '8.2', '8.3', '8.4' ]
 
     steps:
       - uses: actions/checkout@v4

docker/8.0/Dockerfile

@@ -1,7 +1,7 @@
-FROM composer:latest AS composer
+FROM composer:latest as composer
 FROM php:8.0-fpm
 
-COPY ./extra.ini /usr/local/etc/php/conf.d/
+ADD ./extra.ini /usr/local/etc/php/conf.d/
 
 # User/Group globals
 ENV MY_USER="phalcon" \
@@ -30,16 +30,15 @@ RUN apt update -y && \
         libmemcached-dev \
         libpng-dev \
         libpq-dev \
+        libyaml-dev \
         libwebp-dev \
         libxpm-dev \
-        libyaml-dev \
         libzip-dev \
         locales \
         nano \
         sudo \
         wget \
-        zip && \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
+        zip
 
 # PECL Packages
 RUN pecl install -o -f redis && \

docker/8.1/Dockerfile

@@ -1,7 +1,7 @@
-FROM composer:latest AS composer
+FROM composer:latest as composer
 FROM php:8.1-fpm
 
-COPY ./extra.ini /usr/local/etc/php/conf.d/
+ADD ./extra.ini /usr/local/etc/php/conf.d/
 
 # User/Group globals
 ENV MY_USER="phalcon" \
@@ -30,16 +30,15 @@ RUN apt update -y && \
         libmemcached-dev \
         libpng-dev \
         libpq-dev \
+        libyaml-dev \
         libwebp-dev \
         libxpm-dev \
-        libyaml-dev \
         libzip-dev \
         locales \
         nano \
         sudo \
         wget \
-        zip && \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
+        zip
 
 # PECL Packages
 RUN pecl install -o -f redis && \

docker/8.2/Dockerfile

@@ -1,7 +1,7 @@
-FROM composer:latest AS composer
+FROM composer:latest as composer
 FROM php:8.2-fpm
 
-COPY ./extra.ini /usr/local/etc/php/conf.d/
+ADD ./extra.ini /usr/local/etc/php/conf.d/
 
 # User/Group globals
 ENV MY_USER="phalcon" \
@@ -30,16 +30,15 @@ RUN apt update -y && \
         libmemcached-dev \
         libpng-dev \
         libpq-dev \
+        libyaml-dev \
         libwebp-dev \
         libxpm-dev \
-        libyaml-dev \
         libzip-dev \
         locales \
         nano \
         sudo \
         wget \
-        zip && \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
+        zip
 
 # PECL Packages
 RUN pecl install -o -f redis && \

docker/8.3/Dockerfile

@@ -1,7 +1,7 @@
-FROM composer:latest AS composer
+FROM composer:latest as composer
 FROM php:8.3-fpm
 
-COPY ./extra.ini /usr/local/etc/php/conf.d/
+ADD ./extra.ini /usr/local/etc/php/conf.d/
 
 # User/Group globals
 ENV MY_USER="phalcon" \
@@ -30,16 +30,15 @@ RUN apt update -y && \
         libmemcached-dev \
         libpng-dev \
         libpq-dev \
+        libyaml-dev \
         libwebp-dev \
         libxpm-dev \
-        libyaml-dev \
         libzip-dev \
         locales \
         nano \
         sudo \
         wget \
-        zip && \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
+        zip
 
 # Remove this RUN when imagick will be available via pecl
 RUN cd /opt && \

docker/8.4/Dockerfile

@@ -1,24 +1,25 @@
-FROM composer:latest AS composer
+FROM composer:latest as composer
 FROM php:8.4-fpm
 
-COPY ./extra.ini /usr/local/etc/php/conf.d/
+ADD ./extra.ini /usr/local/etc/php/conf.d/
 
 # User/Group globals
 ENV MY_USER="phalcon" \
 	MY_GROUP="phalcon" \
 	MY_UID="1000" \
 	MY_GID="1000" \
-	PHP_VERSION="8.4" \
+	PHP_VERSION="8.3" \
 	LANG=en_US.UTF-8 \
     LANGUAGE=en_US.UTF-8 \
     LC_ALL=en_US.UTF-8
 
 # User and Group
 RUN set -eux && \
 	groupadd -g ${MY_GID} -r ${MY_GROUP} && \
-	useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} && \
+	useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
+
 # Update
-    apt update -y && \
+RUN apt update -y && \
     apt install -y \
         apt-utils \
         gettext \
@@ -29,50 +30,60 @@ RUN set -eux && \
         libmemcached-dev \
         libpng-dev \
         libpq-dev \
+        libyaml-dev \
         libwebp-dev \
         libxpm-dev \
-        libyaml-dev \
         libzip-dev \
         locales \
         nano \
         sudo \
         wget \
-        zip && \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/* && \
+        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
-    pecl install -o -f redis && \
+RUN pecl install -o -f redis && \
     pecl install igbinary \
       msgpack \
       apcu \
       yaml \
-      imagick \
+#      imagick \
       memcached \
-      zephir_parser && \
+      zephir_parser
+
 # Locale
-    sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen && \
+RUN sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen && \
     sed -i -e 's/# el_GR.UTF-8 UTF-8/el_GR.UTF-8 UTF-8/' /etc/locale.gen && \
     sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
     sed -i -e 's/# es_ES.UTF-8 UTF-8/es_ES.UTF-8 UTF-8/' /etc/locale.gen && \
     sed -i -e 's/# ru_RU.UTF-8 UTF-8/ru_RU.UTF-8 UTF-8/' /etc/locale.gen && \
     dpkg-reconfigure --frontend=noninteractive locales && \
-    update-locale LANG=en_US.UTF-8 && \
+    update-locale LANG=en_US.UTF-8
+
 # Install PHP extensions
-    docker-php-ext-configure gd --with-freetype  \
+RUN docker-php-ext-configure gd --with-freetype  \
     --with-jpeg=/usr/include/  \
     --with-xpm \
     --with-webp \
-    --enable-gd && \
-# Install PHP extensions
-    docker-php-ext-install \
+    --enable-gd
+
+RUN docker-php-ext-install \
         gd \
         gettext \
         gmp \
         intl \
         pdo_mysql \
         pdo_pgsql \
-        zip && \
+        zip
+
 # Install PHP extensions
-    docker-php-ext-enable \
+RUN docker-php-ext-enable \
         redis \
         igbinary \
         msgpack \