install mcrypt for php from repo

paskal · Jan 24, 2024 · 457a77b · 457a77b
1 parent 3f5eba0
commit 457a77b
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 32 deletions.
diff --git a/.github/workflows/ci-build-php.yml b/.github/workflows/ci-build-php.yml
@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: available platforms
         run: echo ${{ steps.buildx.outputs.platforms }}

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: available platforms
         run: echo ${{ steps.buildx.outputs.platforms }}

diff --git a/config/php/90-php.ini b/config/php/90-php.ini
@@ -14,14 +14,13 @@ max_execution_time = 60
 post_max_size = 1024M
 memory_limit = 1536M
 upload_max_filesize = 1024M
-extension = mcrypt
 session.use_trans_sid = 0
 session.gc_maxlifetime = 10800
 session.cookie_lifetime = 14400
 
 [opcache]
-opcache.jit=1255
-opcache.jit_buffer_size=512M
+opcache.jit = 1255
+opcache.jit_buffer_size = 512M
 opcache.revalidate_freq = 0
 opcache.validate_timestamps = 1
 opcache.max_accelerated_files = 100000

diff --git a/config/php/Dockerfile.8.1 b/config/php/Dockerfile.8.1
@@ -1,28 +1,28 @@
 FROM phpdockerio/php:8.1-fpm
-# https://github.com/bitrixdock/bitrixdock/blob/master/php81/Dockerfile
+# https://github.com/bitrixdock/bitrixdock/blob/master/php/php81/Dockerfile
 
 LABEL org.opencontainers.image.authors="Dmitry Verkhoturov <paskal.07@gmail.com>" \
-      org.opencontainers.image.description="PHP 8.1 with everything needed for Bitrix" \
+      org.opencontainers.image.description="PHP-fpm 8.1 with everything needed for Bitrix" \
       org.opencontainers.image.documentation="https://github.com/paskal/bitrix.infra" \
       org.opencontainers.image.source="https://github.com/paskal/bitrix.infra.git" \
       org.opencontainers.image.title="php"
 
 RUN apt-get update \
     && apt-get -y --no-install-recommends install \
-    php8.1-memcached \
-    php8.1-memcache \
+    php8.1-gd \
+    php8.1-imagick \
+    php8.1-interbase \
+    php8.1-intl \
     php8.1-mbstring \
+    php8.1-mcrypt \
+    php8.1-memcache \
+    php8.1-memcached \
     php8.1-mysql \
-    php8.1-intl \
-    php8.1-interbase \
+    php8.1-opcache \
     php8.1-redis \
     php8.1-soap \
-    php8.1-gd \
-    php8.1-imagick \
-    php8.1-opcache \
-    php8.1-zip \
     php8.1-xdebug \
-    php-pear php8.1-dev libmcrypt-dev gcc make autoconf libc-dev pkg-config \
+    php8.1-zip \
     webp \
     msmtp \
     msmtp-mta \

diff --git a/config/php/Dockerfile.8.2 b/config/php/Dockerfile.8.2
@@ -1,34 +1,33 @@
 FROM phpdockerio/php:8.2-fpm
-# https://github.com/bitrixdock/bitrixdock/blob/master/php82/Dockerfile
+# https://github.com/bitrixdock/bitrixdock/blob/master/php/php82/Dockerfile
 
 LABEL org.opencontainers.image.authors="Dmitry Verkhoturov <paskal.07@gmail.com>" \
-      org.opencontainers.image.description="PHP 8.2 with everything needed for Bitrix" \
+      org.opencontainers.image.description="PHP-fpm 8.2 with everything needed for Bitrix" \
       org.opencontainers.image.documentation="https://github.com/paskal/bitrix.infra" \
       org.opencontainers.image.source="https://github.com/paskal/bitrix.infra.git" \
       org.opencontainers.image.title="php"
 
 RUN apt-get update \
     && apt-get -y --no-install-recommends install \
-    php8.2-memcached \
-    php8.2-memcache \
+    php8.2-gd \
+    php8.2-imagick \
+    php8.2-interbase \
+    php8.2-intl \
     php8.2-mbstring \
+    php8.2-mcrypt \
+    php8.2-memcache \
+    php8.2-memcached \
     php8.2-mysql \
-    php8.2-intl \
-    php8.2-interbase \
+    php8.2-opcache \
     php8.2-redis \
     php8.2-soap \
-    php8.2-gd \
-    php8.2-imagick \
-    php8.2-opcache \
-    php8.2-zip \
     php8.2-xdebug \
-    php-pear php8.2-dev libmcrypt-dev gcc make autoconf libc-dev pkg-config \
+    php8.2-zip \
     webp \
     msmtp \
     msmtp-mta \
     sudo \
     cron \
-    && pecl install mcrypt-1.0.6 \
     && apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
 
 # msmtp to allow email sending