imagick php8.4?

Author: Sarke

.github/workflows/ci.yaml

@@ -31,30 +31,6 @@ jobs:
           file: Dockerfile-7.4-apache
           tags: sarkedev/php:7.4-apache
 
-  # docker_80:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     -
-  #       name: Set up QEMU
-  #       uses: docker/setup-qemu-action@v1
-  #     -
-  #       name: Set up Docker Buildx
-  #       uses: docker/setup-buildx-action@v1
-  #     -
-  #       name: Login to DockerHub
-  #       uses: docker/login-action@v1
-  #       with:
-  #         username: ${{ secrets.DOCKERHUB_USERNAME }}
-  #         password: ${{ secrets.DOCKERHUB_TOKEN }}
-  #     -
-  #       name: Build and push 8.0
-  #       id: docker_build_80
-  #       uses: docker/build-push-action@v2
-  #       with:
-  #         push: true
-  #         file: Dockerfile-8.0-apache
-  #         tags: sarkedev/php:8.0-apache
-
   docker_81:
     runs-on: ubuntu-latest
     steps:

Dockerfile-8.0-apache

@@ -27,7 +27,8 @@ RUN set -ex \
 		# webp and gd
 		webp libwebp-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libfreetype6-dev zlib1g-dev \
 		# magic
-		imagemagick libcurl3-dev libicu-dev libfreetype6-dev libjpeg-dev libjpeg62-turbo-dev libonig-dev libmagickwand-dev libpq-dev libpng-dev \
+		imagemagick libcurl3-dev libicu-dev libfreetype6-dev libjpeg-dev libjpeg62-turbo-dev libonig-dev \
+		libmagickwand-dev libmagickcore-dev libpq-dev libpng-dev \
 		# async
 		libevent-dev libuv1-dev \
 		# ssh2
@@ -57,17 +58,26 @@ RUN set -ex \
 	&& rm -rf /tmp/* \
 	&& docker-php-source delete
 
-RUN set -ex \
+	RUN set -ex \
 	&& docker-php-source extract \
 	&& pecl install \
 #		event redis imagick igbinary ast xdebug swoole \
-		imap redis imagick igbinary ast xdebug \
+		imap redis igbinary ast xdebug \
 	&& docker-php-ext-enable \
 #		event redis imagick igbinary ast \
-		imap redis imagick igbinary ast \
+		imap redis igbinary ast \
 	&& rm -rf /tmp/* \
 	&& docker-php-source delete
 
+	RUN set -ex \
+		&& docker-php-source extract \
+		&& pecl install \
+			imagick-beta \
+		&& docker-php-ext-enable \
+			imagick \
+		&& rm -rf /tmp/* \
+		&& docker-php-source delete
+
 # Ensure runtime and assets directories exist
 RUN mkdir -p /app/runtime /app/web/assets \
 	&& chown -R www-data:www-data /app/runtime /app/web/assets \

Dockerfile-7.4-apache renamed to apache/7.4/Dockerfile

@@ -17,54 +17,46 @@ services:
     <<: *default
     build:
       context: .
-      dockerfile: Dockerfile-7.4-apache
+      dockerfile: apache/7.4/Dockerfile
     image: 'sarkedev/php:7.4-apache'
     container_name: php74
 
-  # php80:
-  #   <<: *default
-  #   build:
-  #     context: .
-  #     dockerfile: Dockerfile-8.0-apache
-  #   image: 'sarkedev/php:8.0-apache'
-  #   container_name: php80
-
   php81:
     <<: *default
     build:
       context: .
-      dockerfile: Dockerfile-8.1-apache
+      dockerfile: apache/8.1/Dockerfile
     image: 'sarkedev/php:8.1-apache'
     container_name: php81
 
   github-php74:
     <<: *default
     build:
       context: .
-      dockerfile: Dockerfile-7.4-apache
+      dockerfile: apache/7.4/Dockerfile
     image: 'ghcr.io/sarkedev/php:7.4-apache'
     container_name: php74
 
   github-php81:
     <<: *default
     build:
       context: .
-      dockerfile: Dockerfile-8.1-apache
+      dockerfile: apache/8.1/Dockerfile
     image: 'ghcr.io/sarke/php:8.1-apache'
     container_name: php81
 
   github-php84:
     <<: *default
     build:
       context: .
-      dockerfile: Dockerfile-8.4-apache
+      dockerfile: apache/8.4/Dockerfile
     image: 'ghcr.io/sarke/php:8.4-apache'
     container_name: php84
 
   github-php84-fpm:
     <<: *default
     build:
       context: .
-      dockerfile: Dockerfile-8.4-fpm
+      dockerfile: fpm/8.4/Dockerfile
     image: 'ghcr.io/sarke/php:8.4-fpm'
     container_name: php84-fpm