chore: restore

Author: adhocore

.github/workflows/build.yml

@@ -28,23 +28,23 @@ jobs:
           docker pull adhocore/phpfpm:8.2 || true
           docker pull adhocore/phpfpm:8.3 || true
 
-      # - name: "[8.3] Build and push"
-      #   id: docker_build_83
-      #   uses: docker/build-push-action@v4
-      #   with:
-      #     push: true
-      #     file: 8.3.Dockerfile
-      #     tags: adhocore/phpfpm:8.3,adhocore/phpfpm:latest
-      #     platforms: linux/amd64,linux/arm64
+      - name: "[8.3] Build and push"
+        id: docker_build_83
+        uses: docker/build-push-action@v4
+        with:
+          push: true
+          file: 8.3.Dockerfile
+          tags: adhocore/phpfpm:8.3,adhocore/phpfpm:latest
+          platforms: linux/amd64,linux/arm64
 
-      # - name: "[8.2] Build and push"
-      #   id: docker_build_82
-      #   uses: docker/build-push-action@v4
-      #   with:
-      #     push: true
-      #     file: 8.2.Dockerfile
-      #     tags: adhocore/phpfpm:8.2
-      #     platforms: linux/amd64,linux/arm64
+      - name: "[8.2] Build and push"
+        id: docker_build_82
+        uses: docker/build-push-action@v4
+        with:
+          push: true
+          file: 8.2.Dockerfile
+          tags: adhocore/phpfpm:8.2
+          platforms: linux/amd64,linux/arm64
 
       - name: "[8.1] Build and push"
         id: docker_build_81

8.0.Dockerfile

@@ -35,7 +35,7 @@ RUN \
 #
 # php extensions
   && docker-php-source extract \
-#    && rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20200930/intl.so /usr/local/etc/php/conf.d/docker-php-ext-intl.ini \
+    && docker-php-ext-remove intl || true \
     && pecl channel-update pecl.php.net \
     && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \
     && docker-php-ext-install-if $PHP_EXTENSIONS \

8.1.Dockerfile

@@ -13,8 +13,8 @@ ENV \
 COPY docker-* /usr/local/bin/
 
 # copy from existing
-# COPY --from=adhocore/phpfpm:8.1 /usr/local/lib/php/extensions/no-debug-non-zts-20210902/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/
-# COPY --from=adhocore/phpfpm:8.1 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/
+COPY --from=adhocore/phpfpm:8.1 /usr/local/lib/php/extensions/no-debug-non-zts-20210902/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/
+COPY --from=adhocore/phpfpm:8.1 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/
 
 # ext
 COPY ext.php /ext.php
@@ -34,7 +34,7 @@ RUN \
       openldap-back-mdb tidyhtml yaml zlib \
 #
 # php extensions
-  && echo 'php-extensions' && docker-php-source extract \
+  && docker-php-source extract \
     && docker-php-ext-remove intl || true \
     && pecl channel-update pecl.php.net \
     && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \

8.2.Dockerfile

@@ -37,7 +37,7 @@ RUN \
 #
 # php extensions
   && docker-php-source extract \
-    && docker-php-ext-remove intl \
+    && docker-php-ext-remove intl || true \
     && pecl channel-update pecl.php.net \
     && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \
     && docker-php-ext-install-if $PHP_EXTENSIONS \

8.3.Dockerfile

@@ -37,7 +37,7 @@ RUN \
 #
 # php extensions
   && docker-php-source extract \
-    && rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20220829/intl.so /usr/local/etc/php/conf.d/docker-php-ext-intl.ini \
+    && docker-php-ext-remove intl || true \
     && pecl channel-update pecl.php.net \
     && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \
     && docker-php-ext-install-if $PHP_EXTENSIONS \

docker-pecl-ext-install

@@ -16,7 +16,7 @@ usage() {
 modules=
 for module; do
   [[ "$module" == "--help" ]] || [[ "$module" == "-h" ]] && usage >&2
-  [[ -n "$modules" ]] && modules="$modules $module" || modules="$module"
+  [[ -n "$modules" ]] && modules="$modules $module" || modules="$module" || true
 done
 [[ "" = "$modules" ]] && exit 0
 

docker-php-ext-remove

@@ -7,7 +7,7 @@ extDir=$(php -r 'echo ini_get("extension_dir");')
 modules=$@
 [[ "" = "$modules" ]] && exit 0
 
-docker-php-ext-disable $modules
+docker-php-ext-disable $modules || true
 for module; do
-  rm -rf $extDir/$module $extDir/$module.so
+  rm -rf $extDir/$module $extDir/$module.so || true
 done