16 changed files with 753 additions and 599 deletions
--- a/.gitea/workflows/master.yaml
+++ b/.gitea/workflows/master.yaml
@ -1,225 +0,0 @@
-name: Build and push PHP container images
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  base:
-    name: Build php cli with composer
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/catthehacker/ubuntu:act-latest
-    strategy:
-      matrix:
-        params:
-          - os: "alpine"
-            os_version: "3.9"
-            os_label: "true"
-            php_version: "7.2"
-            php_short_version: "7"
-            php_release: "7"
-            composer_version: "2.8.9"
-          - os: "alpine"
-            os_version: "3.12"
-            os_label: "true"
-            php_version: "7.3"
-            php_short_version: "7"
-            php_release: "7"
-            composer_version: "2.8.9"
-          - os: "alpine"
-            os_version: "3.15"
-            os_label: "true"
-            php_version: "7.4"
-            php_short_version: "7"
-            php_release: "7"
-            php_major: 'true'
-            composer_version: "2.8.9"
-          - os: "alpine"
-            os_version: "3.16"
-            os_label: "true"
-            php_version: "8.0"
-            php_short_version: "8"
-            php_release: "8"
-            composer_version: "2.8.9"
-          - os: "alpine"
-            os_version: "3.19"
-            os_label: "true"
-            php_version: "8.1"
-            php_short_version: "81"
-            php_release: "8"
-            composer_version: "2.8.9"
-          - os: "alpine"
-            os_version: "3.21"
-            os_label: "true"
-            php_version: "8.2"
-            php_short_version: "82"
-            php_release: "8"
-            composer_version: "2.8.9"
-          - os: "alpine"
-            os_version: "3.21"
-            os_label: "true"
-            php_version: "8.3"
-            php_short_version: "83"
-            php_release: "8"
-            composer_version: "2.8.9"
-          - os: "alpine"
-            os_version: "3.21"
-            os_label: "true"
-            php_version: "8.4"
-            php_short_version: "84"
-            php_release: "8"
-            php_major: 'true'
-            composer_version: "2.8.9"
-            latest: 'true'
-          - os: "almalinux"
-            os_version: "8.10"
-            os_short_version: "8"
-            php_version: "7.2"
-            php_release: "7"
-            composer_version: "2.8.9"
-          - os: "almalinux"
-            os_version: "8.10"
-            os_short_version: "8"
-            php_version: "7.3"
-            php_release: "7"
-            composer_version: "2.8.9"
-          - os: "almalinux"
-            os_version: "9.5"
-            os_short_version: "9"
-            php_version: "7.4"
-            php_release: "7"
-            composer_version: "2.8.9"
-          - os: "almalinux"
-            os_version: "9.5"
-            os_short_version: "9"
-            php_version: "8.0"
-            php_release: "8"
-            composer_version: "2.8.9"
-          - os: "almalinux"
-            os_version: "9.5"
-            os_short_version: "9"
-            php_version: "8.1"
-            php_release: "8"
-            composer_version: "2.8.9"
-          - os: "almalinux"
-            os_version: "9.5"
-            os_short_version: "9"
-            php_version: "8.2"
-            php_release: "8"
-            composer_version: "2.8.9"
-          - os: "almalinux"
-            os_version: "9.5"
-            os_short_version: "9"
-            php_version: "8.3"
-            php_release: "8"
-            composer_version: "2.8.9"
-          - os: "almalinux"
-            os_version: "9.5"
-            os_short_version: "9"
-            php_version: "8.4"
-            php_release: "8"
-            php_major: 'true'
-            composer_version: "2.8.9"
-            latest: 'true'
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-      - name: Login to quay.io
-        uses: docker/login-action@v3
-        with:
-          registry: quay.io
-          username: ${{ vars.QUAY_USERNAME }}
-          password: ${{ secrets.QUAY_SECRET }}
-      - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v3
-      - if: ${{ matrix.params.os_label != 'true' }}
-        name: Build and push php release
-        uses: docker/build-push-action@v5
-        with:
-          push: true
-          context: .
-          file: Dockerfile.${{ matrix.params.os }}
-          build-args: |
-            OS_VERSION=${{ matrix.params.os_version }}
-            OS_SHORT_VERSION=${{ matirx.params.os_short_version }}
-            PHP_VERSION=${{ matrix.params.php_version }}
-            PHP_SHORT_VERSION=${{ matrix.params.php_short_version }}
-            COMPOSER_VERSION=${{ matrix.params.composer_version }}
-          tags: |
-            quay.io/teras/php:${{ matrix.params.php_version }}
-      - if: ${{ matrix.params.os_label == 'true' }}
-        name: Build and push php release
-        uses: docker/build-push-action@v5
-        with:
-          push: true
-          context: .
-          file: Dockerfile.${{ matrix.params.os }}
-          build-args: |
-            OS_VERSION=${{ matrix.params.os_version }}
-            OS_SHORT_VERSION=${{ matirx.params.os_short_version }}
-            PHP_VERSION=${{ matrix.params.php_version }}
-            PHP_SHORT_VERSION=${{ matrix.params.php_short_version }}
-            COMPOSER_VERSION=${{ matrix.params.composer_version }}
-          tags: |
-            quay.io/teras/php:${{ matrix.params.php_version }}-${{ matrix.params.os }}
-      - if: ${{ matrix.params.php_major == 'true' && matrix.params.os_label != 'true' }}
-        name: Build and push php major release
-        uses: docker/build-push-action@v5
-        with:
-          push: true
-          context: .
-          file: Dockerfile.${{ matrix.params.os }}
-          build-args: |
-            OS_VERSION=${{ matrix.params.os_version }}
-            OS_SHORT_VERSION=${{ matirx.params.os_short_version }}
-            PHP_VERSION=${{ matrix.params.php_version }}
-            PHP_SHORT_VERSION=${{ matrix.params.php_short_version }}
-            COMPOSER_VERSION=${{ matrix.params.composer_version }}
-          tags: |
-            quay.io/teras/php:${{ matrix.params.php_release }}
-      - if: ${{ matrix.params.php_major == 'true' && matrix.params.os_label == 'true' }}
-        name: Build and push php major release
-        uses: docker/build-push-action@v5
-        with:
-          push: true
-          context: .
-          file: Dockerfile.${{ matrix.params.os }}
-          build-args: |
-            OS_VERSION=${{ matrix.params.os_version }}
-            OS_SHORT_VERSION=${{ matirx.params.os_short_version }}
-            PHP_VERSION=${{ matrix.params.php_version }}
-            PHP_SHORT_VERSION=${{ matrix.params.php_short_version }}
-            COMPOSER_VERSION=${{ matrix.params.composer_version }}
-          tags: |
-            quay.io/teras/php:${{ matrix.params.php_release }}-${{ matrix.params.os }}
-      - if: ${{ matrix.params.latest == 'true' && matrix.params.os_label != 'true' }}
-        name: Build and push latest release
-        uses: docker/build-push-action@v5
-        with:
-          push: true
-          context: .
-          file: Dockerfile.${{ matrix.params.os }}
-          build-args: |
-            OS_VERSION=${{ matrix.params.os_version }}
-            OS_SHORT_VERSION=${{ matirx.params.os_short_version }}
-            PHP_VERSION=${{ matrix.params.php_version }}
-            PHP_SHORT_VERSION=${{ matrix.params.php_short_version }}
-            COMPOSER_VERSION=${{ matrix.params.composer_version }}
-          tags: |
-            quay.io/teras/php:latest
-      - if: ${{ matrix.params.latest == 'true' && matrix.params.os_label == 'true' }}
-        name: Build and push latest release
-        uses: docker/build-push-action@v5
-        with:
-          push: true
-          context: .
-          file: Dockerfile.${{ matrix.params.os }}
-          build-args: |
-            OS_VERSION=${{ matrix.params.os_version }}
-            OS_SHORT_VERSION=${{ matirx.params.os_short_version }}
-            PHP_VERSION=${{ matrix.params.php_version }}
-            PHP_SHORT_VERSION=${{ matrix.params.php_short_version }}
-            COMPOSER_VERSION=${{ matrix.params.composer_version }}
-          tags: |
-            quay.io/teras/php:latest-${{ matrix.params.os }}
--- a/.gitea/workflows/php5-almalinux.yaml
+++ b/.gitea/workflows/php5-almalinux.yaml
@ -0,0 +1,125 @@
+name: Build and push PHP 5 container images
+
+on:
+  push:
+    branches:
+      - php5-almalinux
+
+jobs:
+  build:
+    name: Build PHP 5 container images
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/catthehacker/ubuntu:act-latest
+    strategy:
+      matrix:
+        flavors:
+          - os: "almalinux"
+            os_version: "8.10"
+            php_version: "5.6"
+            php_ver_short: "56"
+            mode: cli
+            with_server: "false"
+            with_database: "false"
+          - os: "almalinux"
+            os_version: "8.10"
+            php_version: "5.6"
+            php_ver_short: "56"
+            mode: full
+            with_server: "false"
+            with_database: "false"
+          - os: "almalinux"
+            os_version: "8.10"
+            php_version: "5.6"
+            php_ver_short: "56"
+            mode: debug
+            with_server: "false"
+            with_database: "false"
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Login to quay.io
+        uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: ${{ vars.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_SECRET }}
+      # - name: Set up QEMU
+      #   uses: docker/setup-qemu-action@v3
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v3
+      - if: ${{ matrix.flavors.with_server == 'false' && matrix.flavors.with_database == 'false' }}
+        name: Build and push php5
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          context: .
+          file: 5/Dockerfile.${{ matrix.flavors.mode }}-${{ matrix.flavors.os }}
+          build-args: |
+            OS_VERSION=${{ matrix.flavors.os_version }}
+            FLAVOR=${{ matrix.flavors.mode }}
+            PHP_VERSION=${{ matrix.flavors.php_version }}
+            PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }}
+          tags: |
+            quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-${{ matrix.flavors.mode }}-${{ matrix.flavors.os }}
+      - if: ${{ matrix.flavors.with_server != 'false' && matrix.flavors.with_database == 'false' }}
+        name: Build and push php5 with webserver
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          context: .
+          file: 5/Dockerfile.${{ matrix.flavors.with_server }}-${{ matrix.flavors.os }}
+          build-args: |
+            OS_VERSION=${{ matrix.flavors.os_version }}
+            FLAVOR=${{ matrix.flavors.mode }}
+            PHP_VERSION=${{ matrix.flavors.php_version }}
+            PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }}
+            WITH_APACHE=true
+          tags: |
+            quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-${{ matrix.flavors.mode }}-${{ matrix.flavors.with_server }}-${{ matrix.flavors.os }}
+      - if: ${{ matrix.flavors.with_server != 'false' && matrix.flavors.with_database != 'false' }}
+        name: Build and push php5 with apache2 and database connector library
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          context: .
+          file: 5/Dockerfile.${{ matrix.flavors.with_server }}-${{ matrix.flavors.os }}
+          build-args: |
+            OS_VERSION=${{ matrix.flavors.os_version }}
+            FLAVOR=${{ matrix.flavors.mode }}
+            PHP_VERSION=${{ matrix.flavors.php_version }}
+            PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }}
+            WITH_APACHE=true
+            WITH_DATABASE=${{ matrix.flavors.with_database }}
+          tags: |
+            quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-${{ matrix.flavors.mode }}-${{ matrix.flavors.with_server }}-${{ matrix.flavors.with_database }}-${{ matrix.flavors.os }}
+  # build-latest:
+  #   name: Build latest nginx alpine based container images
+  #   runs-on: ubuntu-latest
+  #   needs:
+  #     - build
+  #   container:
+  #     image: ghcr.io/catthehacker/ubuntu:act-latest
+  #   steps:
+  #     - name: Check out repository code
+  #       uses: actions/checkout@v4
+  #     - name: Login to quay.io
+  #       uses: docker/login-action@v3
+  #       with:
+  #         registry: quay.io
+  #         username: ${{ vars.QUAY_USERNAME }}
+  #         password: ${{ secrets.QUAY_SECRET }}
+  #     # - name: Set up QEMU
+  #     #   uses: docker/setup-qemu-action@v3
+  #     - name: Setup Docker buildx
+  #       uses: docker/setup-buildx-action@v3
+  #     - name: Build and push latest nginx
+  #       uses: docker/build-push-action@v5
+  #       with:
+  #         # platforms: linux/amd64,linux/arm64
+  #         push: true
+  #         context: .
+  #         file: Dockerfile.alpine
+  #         tags: |
+  #           quay.io/sindigilive/nginx:alpine
+  #           quay.io/sindigilive/nginx:latest
--- a/.gitea/workflows/php5-alpine.yaml
+++ b/.gitea/workflows/php5-alpine.yaml
@ -0,0 +1,167 @@
+name: Build and push PHP 5 container images
+
+on:
+  push:
+    branches:
+      - php5-alpine
+
+jobs:
+  build:
+    name: Build PHP 5 container images
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/catthehacker/ubuntu:act-latest
+    strategy:
+      matrix:
+        flavors:
+          - os: "alpine"
+            os_version: "3.6"
+            php_version: "5.6"
+            php_ver_short: "5"
+            mode: cli
+            with_server: "false"
+            with_database: "false"
+          - os: "alpine"
+            os_version: "3.6"
+            php_version: "5.6"
+            php_ver_short: "5"
+            mode: full
+            with_server: "false"
+            with_database: "false"
+          - os: "alpine"
+            os_version: "3.6"
+            php_version: "5.6"
+            php_ver_short: "5"
+            mode: debug
+            with_server: "false"
+            with_database: "false"
+          - os: "alpine"
+            os_version: "3.6"
+            php_version: "5.6"
+            php_ver_short: "5"
+            mode: full
+            with_server: "apache"
+            with_database: "false"
+          - os: "alpine"
+            os_version: "3.6"
+            php_version: "5.6"
+            php_ver_short: "5"
+            mode: full
+            with_server: "apache"
+            with_database: "mysql"
+          - os: "alpine"
+            os_version: "3.6"
+            php_version: "5.6"
+            php_ver_short: "5"
+            mode: full
+            with_server: "apache"
+            with_database: "postgresql"
+          - os: "alpine"
+            os_version: "3.6"
+            php_version: "5.6"
+            php_ver_short: "5"
+            mode: debug
+            with_server: "apache"
+            with_database: "false"
+          - os: "alpine"
+            os_version: "3.6"
+            php_version: "5.6"
+            php_ver_short: "5"
+            mode: debug
+            with_server: "apache"
+            with_database: "mysql"
+          - os: "alpine"
+            os_version: "3.6"
+            php_version: "5.6"
+            php_ver_short: "5"
+            mode: debug
+            with_server: "apache"
+            with_database: "postgresql"
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Login to quay.io
+        uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: ${{ vars.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_SECRET }}
+      # - name: Set up QEMU
+      #   uses: docker/setup-qemu-action@v3
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v3
+      - if: ${{ matrix.flavors.with_server == 'false' && matrix.flavors.with_database == 'false' }}
+        name: Build and push php5
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          context: .
+          file: 5/Dockerfile.${{ matrix.flavors.os }}
+          build-args: |
+            OS_VERSION=${{ matrix.flavors.os_version }}
+            FLAVOR=${{ matrix.flavors.mode }}
+            PHP_VERSION=${{ matrix.flavors.php_version }}
+            PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }}
+          tags: |
+            quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-${{ matrix.flavors.mode }}-${{ matrix.flavors.os }}
+      - if: ${{ matrix.flavors.with_server != 'false' && matrix.flavors.with_database == 'false' }}
+        name: Build and push php5 with webserver
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          context: .
+          file: 5/Dockerfile.${{ matrix.flavors.with_server }}-${{ matrix.flavors.os }}
+          build-args: |
+            OS_VERSION=${{ matrix.flavors.os_version }}
+            FLAVOR=${{ matrix.flavors.mode }}
+            PHP_VERSION=${{ matrix.flavors.php_version }}
+            PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }}
+            WITH_APACHE=true
+          tags: |
+            quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-${{ matrix.flavors.mode }}-${{ matrix.flavors.with_server }}-${{ matrix.flavors.os }}
+      - if: ${{ matrix.flavors.with_server != 'false' && matrix.flavors.with_database != 'false' }}
+        name: Build and push php5 with apache2 and database connector library
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          context: .
+          file: 5/Dockerfile.${{ matrix.flavors.with_server }}-${{ matrix.flavors.os }}
+          build-args: |
+            OS_VERSION=${{ matrix.flavors.os_version }}
+            FLAVOR=${{ matrix.flavors.mode }}
+            PHP_VERSION=${{ matrix.flavors.php_version }}
+            PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }}
+            WITH_APACHE=true
+            WITH_DATABASE=${{ matrix.flavors.with_database }}
+          tags: |
+            quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-${{ matrix.flavors.mode }}-${{ matrix.flavors.with_server }}-${{ matrix.flavors.with_database }}-${{ matrix.flavors.os }}
+  # build-latest:
+  #   name: Build latest nginx alpine based container images
+  #   runs-on: ubuntu-latest
+  #   needs:
+  #     - build
+  #   container:
+  #     image: ghcr.io/catthehacker/ubuntu:act-latest
+  #   steps:
+  #     - name: Check out repository code
+  #       uses: actions/checkout@v4
+  #     - name: Login to quay.io
+  #       uses: docker/login-action@v3
+  #       with:
+  #         registry: quay.io
+  #         username: ${{ vars.QUAY_USERNAME }}
+  #         password: ${{ secrets.QUAY_SECRET }}
+  #     # - name: Set up QEMU
+  #     #   uses: docker/setup-qemu-action@v3
+  #     - name: Setup Docker buildx
+  #       uses: docker/setup-buildx-action@v3
+  #     - name: Build and push latest nginx
+  #       uses: docker/build-push-action@v5
+  #       with:
+  #         # platforms: linux/amd64,linux/arm64
+  #         push: true
+  #         context: .
+  #         file: Dockerfile.alpine
+  #         tags: |
+  #           quay.io/sindigilive/nginx:alpine
+  #           quay.io/sindigilive/nginx:latest
--- a/.gitea/workflows/php7-alpine.yaml
+++ b/.gitea/workflows/php7-alpine.yaml
@ -0,0 +1,194 @@
+name: Build and push PHP 7 container images
+
+on:
+  push:
+    branches:
+      - php7-alpine
+
+jobs:
+  builder:
+    name: Build PHP 7 builder container images
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/catthehacker/ubuntu:act-latest
+    strategy:
+      matrix:
+        flavors:
+          - os: "alpine"
+            os_version: "3.9"
+            php_version: "7.2"
+            php_ver_short: "7"
+          - os: "alpine"
+            os_version: "3.12"
+            php_version: "7.3"
+            php_ver_short: "7"
+          - os: "alpine"
+            os_version: "3.15"
+            php_version: "7.4"
+            php_ver_short: "7"
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Login to quay.io
+        uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: ${{ vars.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_SECRET }}
+      # - name: Set up QEMU
+      #   uses: docker/setup-qemu-action@v3
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Build and push php7 builder
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          context: .
+          file: 7/Dockerfile.${{ matrix.flavors.os }}-builder
+          build-args: |
+            OS_VERSION=${{ matrix.flavors.os_version }}
+            PHP_VERSION=${{ matrix.flavors.php_version }}
+            PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }}
+          tags: |
+            quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-builder-${{ matrix.flavors.os }}
+  flavors:
+    name: Build PHP 7 container images
+    runs-on: ubuntu-latest
+    needs:
+      - builder
+    container:
+      image: ghcr.io/catthehacker/ubuntu:act-latest
+    strategy:
+      matrix:
+        flavors:
+          - os: "alpine"
+            os_version: "3.9"
+            php_version: "7.2"
+            php_ver_short: "7"
+            with_server: "false"
+            with_database: "false"
+          - os: "alpine"
+            os_version: "3.12"
+            php_version: "7.3"
+            php_ver_short: "7"
+            with_server: "false"
+            with_database: "false"
+          - os: "alpine"
+            os_version: "3.15"
+            php_version: "7.4"
+            php_ver_short: "7"
+            with_server: "false"
+            with_database: "false"
+
+          - os: "alpine"
+            os_version: "3.9"
+            php_version: "7.2"
+            php_ver_short: "7"
+            with_server: "apache"
+            with_database: "false"
+          - os: "alpine"
+            os_version: "3.12"
+            php_version: "7.3"
+            php_ver_short: "7"
+            with_server: "apache"
+            with_database: "false"
+          - os: "alpine"
+            os_version: "3.15"
+            php_version: "7.4"
+            php_ver_short: "7"
+            with_server: "apache"
+            with_database: "false"
+
+          - os: "alpine"
+            os_version: "3.9"
+            php_version: "7.2"
+            php_ver_short: "7"
+            with_server: "apache"
+            with_database: "mysql"
+          - os: "alpine"
+            os_version: "3.12"
+            php_version: "7.3"
+            php_ver_short: "7"
+            with_server: "apache"
+            with_database: "mysql"
+          - os: "alpine"
+            os_version: "3.15"
+            php_version: "7.4"
+            php_ver_short: "7"
+            with_server: "apache"
+            with_database: "mysql"
+
+          - os: "alpine"
+            os_version: "3.9"
+            php_version: "7.2"
+            php_ver_short: "7"
+            with_server: "apache"
+            with_database: "postgresql"
+          - os: "alpine"
+            os_version: "3.12"
+            php_version: "7.3"
+            php_ver_short: "7"
+            with_server: "apache"
+            with_database: "postgresql"
+          - os: "alpine"
+            os_version: "3.15"
+            php_version: "7.4"
+            php_ver_short: "7"
+            with_server: "apache"
+            with_database: "postgresql"
+
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Login to quay.io
+        uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: ${{ vars.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_SECRET }}
+      # - name: Set up QEMU
+      #   uses: docker/setup-qemu-action@v3
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v3
+      - if: ${{ matrix.flavors.with_server == 'false' && matrix.flavors.with_database == 'false' }}
+        name: Build and push php7
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          context: .
+          file: 7/Dockerfile.${{ matrix.flavors.os }}
+          build-args: |
+            OS_VERSION=${{ matrix.flavors.os_version }}
+            PHP_VERSION=${{ matrix.flavors.php_version }}
+            PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }}
+          tags: |
+            quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-${{ matrix.flavors.os }}
+      - if: ${{ matrix.flavors.with_server != 'false' && matrix.flavors.with_database == 'false' }}
+        name: Build and push php7 with webserver
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          context: .
+          file: 7/Dockerfile.${{ matrix.flavors.os }}-${{ matrix.flavors.with_server }}
+          build-args: |
+            OS_VERSION=${{ matrix.flavors.os_version }}
+            PHP_VERSION=${{ matrix.flavors.php_version }}
+            PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }}
+            WITH_APACHE=true
+          tags: |
+            quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-${{ matrix.flavors.with_server }}-${{ matrix.flavors.os }}
+      - if: ${{ matrix.flavors.with_server != 'false' && matrix.flavors.with_database != 'false' }}
+        name: Build and push php7 with webserver and database connector library
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          context: .
+          file: 7/Dockerfile.${{ matrix.flavors.os }}-${{ matrix.flavors.with_server }}
+          build-args: |
+            OS_VERSION=${{ matrix.flavors.os_version }}
+            PHP_VERSION=${{ matrix.flavors.php_version }}
+            PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }}
+            WITH_APACHE=true
+            WITH_DATABASE=${{ matrix.flavors.with_database }}
+          tags: |
+            quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-${{ matrix.flavors.with_server }}-${{ matrix.flavors.with_database }}-${{ matrix.flavors.os }}
--- a/.gitea/workflows/php8-alpine.yaml
+++ b/.gitea/workflows/php8-alpine.yaml
@ -0,0 +1,223 @@
+name: Build and push PHP 8 container images
+
+on:
+  push:
+    branches:
+      - php8-alpine
+
+jobs:
+  builder:
+    name: Build PHP 8 builder container images
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/catthehacker/ubuntu:act-latest
+    strategy:
+      matrix:
+        flavors:
+          - os: "alpine"
+            os_version: "3.16"
+            php_version: "8.0"
+            php_ver_short: "8"
+          - os: "alpine"
+            os_version: "3.19"
+            php_version: "8.1"
+            php_ver_short: "81"
+          - os: "alpine"
+            os_version: "3.21"
+            php_version: "8.2"
+            php_ver_short: "83"
+          - os: "alpine"
+            os_version: "3.21"
+            php_version: "8.3"
+            php_ver_short: "83"
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Login to quay.io
+        uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: ${{ vars.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_SECRET }}
+      # - name: Set up QEMU
+      #   uses: docker/setup-qemu-action@v3
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Build and push php8 builder
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          context: .
+          file: 8/Dockerfile.${{ matrix.flavors.os }}-builder
+          build-args: |
+            OS_VERSION=${{ matrix.flavors.os_version }}
+            PHP_VERSION=${{ matrix.flavors.php_version }}
+            PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }}
+          tags: |
+            quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-builder-${{ matrix.flavors.os }}
+
+  flavors:
+    name: Build PHP 8 container images
+    runs-on: ubuntu-latest
+    needs:
+      - builder
+    container:
+      image: ghcr.io/catthehacker/ubuntu:act-latest
+    strategy:
+      matrix:
+        flavors:
+          - os: "alpine"
+            os_version: "3.16"
+            php_version: "8.0"
+            php_ver_short: "8"
+            with_server: "false"
+            with_database: "false"
+          - os: "alpine"
+            os_version: "3.19"
+            php_version: "8.1"
+            php_ver_short: "81"
+            with_server: "false"
+            with_database: "false"
+          - os: "alpine"
+            os_version: "3.21"
+            php_version: "8.2"
+            php_ver_short: "82"
+            with_server: "false"
+            with_database: "false"
+          - os: "alpine"
+            os_version: "3.21"
+            php_version: "8.3"
+            php_ver_short: "83"
+            with_server: "false"
+            with_database: "false"
+
+          - os: "alpine"
+            os_version: "3.16"
+            php_version: "8.0"
+            php_ver_short: "8"
+            with_server: "apache"
+            with_database: "false"
+          - os: "alpine"
+            os_version: "3.19"
+            php_version: "8.1"
+            php_ver_short: "81"
+            with_server: "apache"
+            with_database: "false"
+          - os: "alpine"
+            os_version: "3.21"
+            php_version: "8.2"
+            php_ver_short: "82"
+            with_server: "apache"
+            with_database: "false"
+          - os: "alpine"
+            os_version: "3.21"
+            php_version: "8.3"
+            php_ver_short: "83"
+            with_server: "apache"
+            with_database: "false"
+
+          - os: "alpine"
+            os_version: "3.16"
+            php_version: "8.0"
+            php_ver_short: "8"
+            with_server: "apache"
+            with_database: "mysql"
+          - os: "alpine"
+            os_version: "3.19"
+            php_version: "8.1"
+            php_ver_short: "81"
+            with_server: "apache"
+            with_database: "mysql"
+          - os: "alpine"
+            os_version: "3.21"
+            php_version: "8.2"
+            php_ver_short: "82"
+            with_server: "apache"
+            with_database: "mysql"
+          - os: "alpine"
+            os_version: "3.21"
+            php_version: "8.3"
+            php_ver_short: "83"
+            with_server: "apache"
+            with_database: "mysql"
+
+          - os: "alpine"
+            os_version: "3.16"
+            php_version: "8.0"
+            php_ver_short: "8"
+            with_server: "apache"
+            with_database: "postgresql"
+          - os: "alpine"
+            os_version: "3.19"
+            php_version: "8.1"
+            php_ver_short: "81"
+            with_server: "apache"
+            with_database: "postgresql"
+          - os: "alpine"
+            os_version: "3.21"
+            php_version: "8.2"
+            php_ver_short: "82"
+            with_server: "apache"
+            with_database: "postgresql"
+          - os: "alpine"
+            os_version: "3.21"
+            php_version: "8.3"
+            php_ver_short: "83"
+            with_server: "apache"
+            with_database: "postgresql"
+
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Login to quay.io
+        uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: ${{ vars.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_SECRET }}
+      # - name: Set up QEMU
+      #   uses: docker/setup-qemu-action@v3
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v3
+      - if: ${{ matrix.flavors.with_server == 'false' && matrix.flavors.with_database == 'false' }}
+        name: Build and push php8
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          context: .
+          file: 8/Dockerfile.${{ matrix.flavors.os }}
+          build-args: |
+            OS_VERSION=${{ matrix.flavors.os_version }}
+            PHP_VERSION=${{ matrix.flavors.php_version }}
+            PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }}
+          tags: |
+            quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-${{ matrix.flavors.os }}
+      - if: ${{ matrix.flavors.with_server != 'false' && matrix.flavors.with_database == 'false' }}
+        name: Build and push php8 with webserver
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          context: .
+          file: 8/Dockerfile.${{ matrix.flavors.os }}-${{ matrix.flavors.with_server }}
+          build-args: |
+            OS_VERSION=${{ matrix.flavors.os_version }}
+            PHP_VERSION=${{ matrix.flavors.php_version }}
+            PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }}
+            WITH_APACHE=true
+          tags: |
+            quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-${{ matrix.flavors.with_server }}-${{ matrix.flavors.os }}
+      - if: ${{ matrix.flavors.with_server != 'false' && matrix.flavors.with_database != 'false' }}
+        name: Build and push php8 with webserver and database connector library
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          context: .
+          file: 8/Dockerfile.${{ matrix.flavors.os }}-${{ matrix.flavors.with_server }}
+          build-args: |
+            OS_VERSION=${{ matrix.flavors.os_version }}
+            PHP_VERSION=${{ matrix.flavors.php_version }}
+            PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }}
+            WITH_APACHE=true
+            WITH_DATABASE=${{ matrix.flavors.with_database }}
+          tags: |
+            quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-${{ matrix.flavors.with_server }}-${{ matrix.flavors.with_database }}-${{ matrix.flavors.os }}
--- a/5/Dockerfile.alpine
+++ b/5/Dockerfile.alpine
@ -9,39 +9,23 @@ ARG WITH_APACHE=false
 ARG WITH_DATABASE=false
 ARG PHP_VERSION=5.6
 ARG PHP_VER_SHORT=5
-ARG COMPOSER_VERSION=2.2.25
-ARG COMPOSER_VER_SHORT=2.2

 ENV FLAVOR=${FLAVOR}
 ENV WITH_APACHE=${WITH_APACHE}
 ENV WITH_DATABASE=${WITH_DATABASE}
 ENV PHP_VERSION=${PHP_VERSION}
 ENV PHP_VER_SHORT=${PHP_VER_SHORT}
-ENV COMPOSER_VERSION=${COMPOSER_VERSION}
-ENV COMPOSER_VER_SHORT=${COMPOSER_VER_SHORT}

-# Set composer home
-ENV COMPOSER_HOME=/app
-ENV COMPOSER_CACHE_DIR=${COMPOSER_HOME}/cache
+WORKDIR /root

-WORKDIR /tmp
-
-ADD 5/scripts/alpine-setup.sh ./setup.sh
-
-# Download and install composer
-ADD https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar /usr/local/bin/composer
+ADD 5/scripts/alpine-setup.sh /tmp/setup.sh

 # Create directory, and install required php app
-RUN /bin/mkdir -p ${COMPOSER_HOME}/build ${COMPOSER_CACHE_DIR}/files \
-    ${COMPOSER_CACHE_DIR}/repo ${COMPOSER_CACHE_DIR}/vcs ; \
-    /app ; \
-    /usr/sbin/addgroup -g 10001 php ; \
-    /usr/sbin/adduser -D -u 10001 -G php -s /sbin/nologin -h ${COMPOSER_HOME}/build php ; \
-    /bin/mkdir -p /app ; \
+RUN /bin/mkdir -p /app ; \
    /sbin/apk add --update --no-cache \
              php${PHP_VER_SHORT} php${PHP_VER_SHORT}-common \
-              php${PHP_VER_SHORT}-cli php${PHP_VER_SHORT}-phar ; \
-    /bin/chmod +x /tmp/setup.sh /usr/local/bin/composer ; \
+              php${PHP_VER_SHORT}-cli ; \
+    /bin/chmod +x /tmp/setup.sh; \
    /bin/sh /tmp/setup.sh; \
    /bin/rm -f /tmp/*.sh;

--- a/5/Dockerfile.apache-alpine
+++ b/5/Dockerfile.apache-alpine
--- a/5/scripts/alpine-setup.sh
+++ b/5/scripts/alpine-setup.sh
@ -6,7 +6,7 @@ dom,embed,enchant,exif,ftp,
 gd,gettext,gmp,iconv,imap,
 intl,json,ldap,mcrypt,
 opcache,openssl,pcntl,pdo,
-pear,phpdbg,
+pear,phar,phpdbg,
 posix,pspell,shmop,
 snmp,soap,sockets,sysvmsg,sysvsem,
 sysvshm,wddx,xml,xmlreader,
@ -19,33 +19,42 @@ LOG_LEVEL="info"

 # Setup php flavor

-for i in $(echo $PHP_LIST | tr "," "\n"); do
-    PHP_DEPS="${PHP_DEPS} php$PHP_VER_SHORT-$i ";
-done
+if [[ "$FLAVOR" == "debug" ]]; then
+    LOG_LEVEL="debug"
+    /sbin/apk add --update --no-cache php$PHP_VER_SHORT-dbg;
+fi
+
+if [ "$FLAVOR" == "full" ] || [ "$FLAVOR" == "debug" ]; then
+    for i in $(echo $PHP_LIST | tr "," "\n"); do
+        PHP_DEPS="${PHP_DEPS} php$PHP_VER_SHORT-$i ";
+    done

 /sbin/apk add --update --no-cache $PHP_DEPS;
+fi

 # Only setup apache with full flavor parameters
 if [ "$WITH_APACHE" == "true" ]; then
-    /usr/sbin/addgroup -g 10001 apache ;
-    /usr/sbin/adduser -D -u 10001 -G apache -s /sbin/nologin -h $APP_ROOT apache ;
-    /sbin/apk add --update --no-cache apache2 php$PHP_VER_SHORT-apache2 ;
+    if [ "$FLAVOR" == "full" ] || [ "$FLAVOR" == "debug" ]; then
+        /usr/sbin/addgroup -g 10001 apache ;
+        /usr/sbin/adduser -D -u 10001 -G apache -s /bin/sh -h $APP_ROOT apache ;
+        /sbin/apk add --update --no-cache apache2 php$PHP_VER_SHORT-apache2 ;

-    sed -i "s|ServerRoot /var/www|ServerRoot ${SERVER_ROOT}|" /etc/apache2/httpd.conf ;
-    sed -i "s|ServerAdmin you@example.com| ServerAdmin map@sindigilive.com|" /etc/apache2/httpd.conf ;
-    sed -i "s|DocumentRoot \"/var/www/localhost/htdocs\"|DocumentRoot \"${APP_ROOT}\"|" /etc/apache2/httpd.conf ;
-    sed -i "s|Directory \"/var/www/localhost/htdocs\"|Directory \"${APP_ROOT}\"|" /etc/apache2/httpd.conf ;
-    sed -i "s|AllowOverride None|AllowOverride All|" /etc/apache2/httpd.conf ;
-    sed -i "s|ErrorLog .*|ErrorLog /dev/stderr \nTransferLog /dev/stdout|" /etc/apache2/httpd.conf ;
-    sed -i "s|CustomLog .* combined|CustomLog /dev/stdout combined|" /etc/apache2/httpd.conf ;
-    sed -i "s|LogLevel .*|LogLevel ${LOG_LEVEL}|" /etc/apache2/httpd.conf ;
-    sed -i "s|#LoadModule rewrite_module|LoadModule rewrite_module|" /etc/apache2/httpd.conf ;
-    sed -i "s|#LoadModule deflate_module|LoadModule deflate_module|" /etc/apache2/httpd.conf ;
-    sed -i "s|#LoadModule expires_module|LoadModule expires_module|" /etc/apache2/httpd.conf ;
-    sed -i "s|/var/www/localhost/cgi-bin/|/app/cgi-bin/|" /etc/apache2/httpd.conf ;
-    sed -i "s|Require host .example.com|#Require host .example.com|" /etc/apache2/conf.d/info.conf ;
-    sed -i "s|Require ip 127|Require all granted|" /etc/apache2/conf.d/info.conf ;
-    sed -i "s|/run/apache2/httpd.pid|${SERVER_ROOT}/run/httpd.pid|" /etc/apache2/conf.d/mpm.conf ;
+        sed -i "s|ServerRoot /var/www|ServerRoot ${SERVER_ROOT}|" /etc/apache2/httpd.conf ;
+        sed -i "s|ServerAdmin you@example.com| ServerAdmin map@sindigilive.com|" /etc/apache2/httpd.conf ;
+        sed -i "s|DocumentRoot \"/var/www/localhost/htdocs\"|DocumentRoot \"${APP_ROOT}\"|" /etc/apache2/httpd.conf ;
+        sed -i "s|Directory \"/var/www/localhost/htdocs\"|Directory \"${APP_ROOT}\"|" /etc/apache2/httpd.conf ;
+        sed -i "s|AllowOverride None|AllowOverride All|" /etc/apache2/httpd.conf ;
+        sed -i "s|ErrorLog .*|ErrorLog /dev/stderr \nTransferLog /dev/stdout|" /etc/apache2/httpd.conf ;
+        sed -i "s|CustomLog .* combined|CustomLog /dev/stdout combined|" /etc/apache2/httpd.conf ;
+        sed -i "s|LogLevel .*|LogLevel ${LOG_LEVEL}|" /etc/apache2/httpd.conf ;
+        sed -i "s|#LoadModule rewrite_module|LoadModule rewrite_module|" /etc/apache2/httpd.conf ;
+        sed -i "s|#LoadModule deflate_module|LoadModule deflate_module|" /etc/apache2/httpd.conf ;
+        sed -i "s|#LoadModule expires_module|LoadModule expires_module|" /etc/apache2/httpd.conf ;
+        sed -i "s|/var/www/localhost/cgi-bin/|/app/cgi-bin/|" /etc/apache2/httpd.conf ;
+        sed -i "s|Require host .example.com|#Require host .example.com|" /etc/apache2/conf.d/info.conf ;
+        sed -i "s|Require ip 127|Require all granted|" /etc/apache2/conf.d/info.conf ;
+        sed -i "s|/run/apache2/httpd.pid|${SERVER_ROOT}/run/httpd.pid|" /etc/apache2/conf.d/mpm.conf ;
+    fi
 fi

 if [ "$WITH_DATABASE" == "postgresql" ]; then
@ -53,6 +62,5 @@ if [ "$WITH_DATABASE" == "postgresql" ]; then
 fi

 if [ "$WITH_DATABASE" == "mysql" ]; then
-    /sbin/apk add --update --no-cache php$PHP_VER_SHORT-pdo php$PHP_VER_SHORT-pdo_mysql php$PHP_VER_SHORT-mysql \
-                  php$PHP_VER_SHORT-mysqli ;
+    /sbin/apk add --update --no-cache php$PHP_VER_SHORT-pdo php$PHP_VER_SHORT-pdo_mysql php$PHP_VER_SHORT-mysql php$PHP_VER_SHORT-mysqli ;
 fi
--- a/7/Dockerfile.almalinux
+++ b/7/Dockerfile.almalinux
@ -1,68 +0,0 @@
-ARG OS_VERSION=8.10
-
-FROM quay.io/teras/almalinux:${OS_VERSION}-minimal AS builder
-
-ARG PHP_VERSION=7.4
-ARG COMPOSER_VERSION=2.8.9
-
-ENV PHP_VERSION=${PHP_VERSION}
-ENV COMPOSER_VERSION=${COMPOSER_VERSION}
-ENV SERVER_ROOT=/app
-
-RUN /bin/microdnf -y --nodocs install shadow-utils; \
-    /bin/mkdir -p ${SERVER_ROOT}; \
-    /sbin/groupadd -g 10000 php; \
-    /sbin/useradd -u 10000 -g 10000 -s /bin/sh -M -d ${SERVER_ROOT} php; \
-    /bin/chown -R php:php ${SERVER_ROOT}; \
-    /bin/microdnf -y --nodocs install epel-release; \
-    /bin/microdnf -y upgrade; \
-    /bin/rpm -Uvh --replacepkgs --replacefiles \
-             https://rpms.remirepo.net/enterprise/remi-release-8.rpm; \
-    /bin/microdnf -y module reset php; \
-    /bin/microdnf -y module enable php:remi-${PHP_VERSION}; \
-    /bin/microdnf -y --nodocs install \
-                     php php-cli php-common php-phar \
-                     php-iconv php-mbstring php-json;
-
-ADD https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar /usr/local/bin/composer
-
-RUN /bin/chmod +rx /usr/local/bin/composer; \
-    /bin/microdnf -y remove shadow-utils; \
-    /bin/microdnf clean all; \
-    /bin/rm -rf /var/cache/yum/*; \
-    /bin/rm -rf /var/lib/yum/history/*; \
-    /bin/rm -rf /var/lib/yum/yumdb/*; \
-    /bin/rm -rf /var/lib/dnf/*;
-
-# Create symlinks to /usr/bin/php in case it doesn't exists
-RUN ln -ns /usr/bin/php${PHP_VERSION} /usr/bin/php; exit 0
-
-FROM scratch
-
-ARG PHP_VERSION=7.4
-ARG COMPOSER_VERSION=2.8.9
-
-ENV PHP_VERSION=${PHP_VERSION}
-ENV COMPOSER_VERSION=${COMPOSER_VERSION}
-ENV SERVER_ROOT=/app
-
-LABEL maintainer="Muhamad Aditya Prima <aditya@teraslink.id>"
-LABEL name="php"
-LABEL version="${PHP_VERSION}"
-LABEL distribution-scope="public"
-
-#labels for container catalog
-LABEL summary="PHP ${PHP_VERSION} on almalinux-minimal container image"
-LABEL description="Provide php on almalinux-minimal container base image"
-LABEL io.k8s.description="PHP with composer"
-LABEL io.k8s.display-name="PHP ${PHP_VERSION}"
-
-COPY --from=builder / /
-
-WORKDIR ${SERVER_ROOT}
-
-USER php
-
-STOPSIGNAL SIGQUIT
-
-CMD ["/usr/bin/php", "-v"]
--- a/8/Dockerfile.almalinux-apache
+++ b/8/Dockerfile.almalinux-apache
@ -1,3 +0,0 @@
-ARG PHP_VERSION=8.4
-
-FROM quay.io/teras/php:${PHP_VERSION}
--- a/8/Dockerfile.alpine-bak
+++ b/8/Dockerfile.alpine-bak
@ -3,7 +3,7 @@
 # PHP 8.2 == 3.21
 # PHP 8.3 == 3.21
 ARG OS_VERSION=3.21
-ARG PHP_VERSION=8.4
+ARG PHP_VERSION=8.3

 FROM quay.io/sindigilive/php:${PHP_VERSION}-builder-alpine AS builder

@ -20,11 +20,11 @@ RUN /bin/sh /tmp/setup.sh; \

 FROM scratch

-ARG PHP_VERSION=8.4
-ARG PHP_SHORT_VERSION=84
+ARG PHP_VERSION=8.3
+ARG PHP_VER_SHORT=8

 ENV PHP_VERSION=${PHP_VERSION}
-ENV PHP_SHORT_VERSION=${PHP_SHORT_VERSION}
+ENV PHP_VER_SHORT=${PHP_VER_SHORT}

 LABEL maintainer="Muhamad Aditya Prima <map@sindigilive.com>"
 LABEL name="php"
--- a/8/scripts/almalinux-apache-setup.sh
+++ b/8/scripts/almalinux-apache-setup.sh
@ -1,31 +0,0 @@
-# DIRECTORY CONFIGURATION
-SERVER_ROOT="/app"
-APP_ROOT="$SERVER_ROOT/htdocs"
-LOG_LEVEL="info"
-
-/bin/mkdir -p $APP_ROOT $SERVER_ROOT/run $SERVER_ROOT/log $SERVER_ROOT/cgi-bin;
-/usr/sbin/groupadd -g 10001 httpd ;
-/usr/sbin/useradd -D -u 10001 -g 10001 -s /bin/sh -h $APP_ROOT httpd ;
-/bin/chown -R httpd:httpd $SERVER_ROOT;
-/bin/chmod -R 755 $APP_ROOT;
-
-sed -i "s|ServerRoot /var/www|ServerRoot ${SERVER_ROOT}|" /etc/httpd/httpd.conf ;
-sed -i "s|User apache|User httpd|" /etc/httpd/httpd.conf ;
-sed -i "s|Group httpd|Group httpd|" /etc/httpd/httpd.conf ;
-sed -i "s|ServerAdmin root@localhost| ServerAdmin httpd@localhost|" /etc/httpd/httpd.conf ;
-sed -i "s|DocumentRoot \"/var/www\"|DocumentRoot \"${SERVER_ROOT}\"|" /etc/httpd/httpd.conf ;
-sed -i "s|DocumentRoot \"/var/www/html\"|DocumentRoot \"${APP_ROOT}\"|" /etc/httpd/httpd.conf ;
-sed -i "s|Directory \"/var/www/html\"|Directory \"${APP_ROOT}\"|" /etc/httpd/httpd.conf ;
-sed -i "s|AllowOverride None|AllowOverride All|" /etc/httpd/httpd.conf ;
-sed -i "s|ErrorLog .*|ErrorLog /dev/stderr \nTransferLog /dev/stdout|" /etc/httpd/httpd.conf ;
-sed -i "s|CustomLog .* combined|CustomLog /dev/stdout combined|" /etc/httpd/httpd.conf ;
-sed -i "s|LogLevel .*|LogLevel ${LOG_LEVEL}|" /etc/httpd/httpd.conf ;
-sed -i "s|LogLevel .*|LogLevel ${LOG_LEVEL}|" /etc/httpd/httpd.conf ;
-#sed -i "s|#LoadModule rewrite_module|LoadModule rewrite_module|" /etc/httpd/httpd.conf ;
-#sed -i "s|#LoadModule deflate_module|LoadModule deflate_module|" /etc/httpd/httpd.conf ;
-#sed -i "s|#LoadModule expires_module|LoadModule expires_module|" /etc/httpd/httpd.conf ;
-sed -i "s|/var/www/cgi-bin/|${SERVER_ROOT}/cgi-bin/|" /etc/httpd/httpd.conf ;
-
-# sed -i "s|Require host .example.com|#Require host .example.com|" /etc/apache2/conf.d/info.conf ;
-# sed -i "s|Require ip 127|Require all granted|" /etc/apache2/conf.d/info.conf ;
-# sed -i "s|/run/apache2/httpd.pid|${SERVER_ROOT}/run/httpd.pid|" /etc/apache2/conf.d/mpm.conf ;
--- a/8/scripts/entrypoint.sh
+++ b/8/scripts/entrypoint.sh
--- a/Dockerfile.almalinux
+++ b/Dockerfile.almalinux
@ -1,126 +0,0 @@
-ARG OS_VERSION=9.5
-
-FROM quay.io/teras/almalinux:${OS_VERSION}-minimal AS builder
-
-ARG OS_SHORT_VERSION=9
-ARG PHP_VERSION=8.4
-ARG COMPOSER_VERSION=2.8.9
-ARG WEB_SERVER=false
-
-ENV PHP_VERSION=${PHP_VERSION}
-ENV COMPOSER_VERSION=${COMPOSER_VERSION}
-ENV SERVER_ROOT=/app
-ENV APP_ROOT=${SERVER_ROOT}/htdocs
-ENV WEB_SERVER=${WEB_SERVER}
-
-ENV COMPOSER_HOME=/var/lib/composer
-ENV COMPOSER_ALLOW_SUPERUSER=0
-ENV COMPOSER_NO_INTERACTION=1
-ENV COMPOSER_CACHE_DIR=${COMPOSER_HOME}/cache
-ENV COMPOSER_VENDOR_DIR=${COMPOSER_HOME}/vendor
-ENV COMPOSER_BIN_DIR=${COMPOSER_HOME}/bin
-
-USER root
-WORKDIR ${SERVER_ROOT}
-
-ADD https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar /usr/local/bin/composer
-ADD ./htdocs/index.html ${APP_ROOT}/
-
-RUN /bin/mkdir -p ${COMPOSER_CACHE_DIR} ${COMPOSER_VENDOR_DIR} ${COMPOSER_BIN_DIR}; \
-    /bin/chown -R appuser:appuser ${COMPOSER_HOME}; \
-    /bin/microdnf -y --nodocs install epel-release; \
-    /bin/microdnf -y upgrade; \
-    /bin/rpm -Uvh --replacepkgs --replacefiles \
-             https://rpms.remirepo.net/enterprise/remi-release-${OS_SHORT_VERSION}.rpm; \
-    /bin/microdnf -y module reset php; \
-    /bin/microdnf -y module enable php:remi-${PHP_VERSION}; \
-    /bin/microdnf -y --nodocs install \
-                     php php-cli php-common php-phar \
-                     php-iconv php-mbstring php-json; \
-    /bin/chmod +rx /usr/local/bin/composer; \
-    /bin/sed -i "s|#version#|${PHP_VERSION}}|" ${APP_ROOT}/index.html ;
-
-# Run if httpd is being installed, otherwise remove all packages related to it
-RUN if [ ${WEB_SERVER} = "apache" ]; then \
-        /bin/mkdir -p ${SERVER_ROOT}/cgi-bin; \
-        /bin/chown -R appuser:appuser ${SERVER_ROOT}/cgi-bin; \
-        /bin/chown -R appuser:appuser /etc/httpd \
-        /bin/sed -i "s|ServerRoot /var/www|ServerRoot ${SERVER_ROOT}|" /etc/httpd/conf/httpd.conf ; \
-        /bin/sed -i "s|User apache|User appuser|" /etc/httpd/conf/httpd.conf ; \
-        /bin/sed -i "s|Group httpd|Group appuser|" /etc/httpd/conf/httpd.conf ; \
-        /bin/sed -i "s|ServerAdmin root@localhost| ServerAdmin appuser@localhost|" /etc/httpd/conf/httpd.conf ; \
-        /bin/sed -i "s|DocumentRoot \"/var/www\"|DocumentRoot \"${SERVER_ROOT}\"|" /etc/httpd/conf/httpd.conf ; \
-        /bin/sed -i "s|DocumentRoot \"/var/www/html\"|DocumentRoot \"${APP_ROOT}\"|" /etc/httpd/conf/httpd.conf ; \
-        /bin/sed -i "s|Directory \"/var/www/html\"|Directory \"${APP_ROOT}\"|" /etc/httpd/conf/httpd.conf ; \
-        /bin/sed -i "s|AllowOverride None|AllowOverride All|" /etc/httpd/conf/httpd.conf ; \
-        /bin/sed -i "s|ErrorLog .*|ErrorLog /dev/stderr \nTransferLog /dev/stdout|" /etc/httpd/conf/httpd.conf ; \
-        /bin/sed -i "s|CustomLog .* combined|CustomLog /dev/stdout combined|" /etc/httpd/conf/httpd.conf ; \
-        /bin/sed -i "s|LogLevel .*|LogLevel ${LOG_LEVEL}|" /etc/httpd/conf/httpd.conf ; \
-        /bin/sed -i "s|LogLevel .*|LogLevel ${LOG_LEVEL}|" /etc/httpd/conf/httpd.conf ; \
-        /bin/sed -i "s|/var/www/cgi-bin/|${SERVER_ROOT}/cgi-bin/|" /etc/httpd/conf/httpd.conf ; \
-    else \
-        /bin/rpm -e --nodeps $(rpm -qa | grep ^httpd) php-fpm; \
-        /bin/rm -rf /etc/httpd; \
-    fi
-
-# Run if nginx is being installed otherwise remove all packages related to it
-RUN if [ ${WEB_SERVER} = "fpm-nginx" ]; then \
-        /bin/microdnf -y --nodocs install nginx php-fpm; \
-    else \
-        /bin/rpm -e --nodeps $(rpm -qa | grep ^nginx); \
-    fi
-
-# Remove unnecessary packages and clean up all cached files
-RUN rpm -e --nodeps python-unversioned-command $(rpm -qa | grep ^python3) ; \
-    rm -rf /usr/lib/python3* /usr/lib64/python3* /usr/share/doc/python3* /usr/share/man/man1/python3* ; \
-    /bin/microdnf clean all; \
-    /bin/rm -rf /var/cache/yum/*; \
-    /bin/rm -rf /var/lib/yum/history/*; \
-    /bin/rm -rf /var/lib/yum/yumdb/*; \
-    /bin/rm -rf /var/lib/dnf/*;
-
-# Create symlinks to /usr/bin/php in case it doesn't exists
-RUN ln -ns /usr/bin/php${PHP_VERSION} /usr/bin/php; exit 0
-
-FROM scratch
-
-ARG PHP_VERSION=8.4
-ARG COMPOSER_VERSION=2.8.9
-
-# Environment variables for user root
-ENV LANG=en_US.UTF-8
-
-ENV PHP_VERSION=${PHP_VERSION}
-ENV COMPOSER_VERSION=${COMPOSER_VERSION}
-ENV SERVER_ROOT=/app
-ENV APP_ROOT=${SERVER_ROOT}/htdocs
-
-ENV COMPOSER_HOME=${SERVER_ROOT}/.composer
-ENV COMPOSER_ALLOW_SUPERUSER=0
-ENV COMPOSER_NO_INTERACTION=1
-ENV COMPOSER_CACHE_DIR=${COMPOSER_HOME}/cache
-ENV COMPOSER_VENDOR_DIR=${COMPOSER_HOME}/vendor
-ENV COMPOSER_BIN_DIR=${COMPOSER_HOME}/bin
-
-LABEL maintainer="Muhamad Aditya Prima <aditya@teraslink.id>"
-LABEL name="php"
-LABEL version="${PHP_VERSION}"
-LABEL distribution-scope="public"
-
-#labels for container catalog
-LABEL summary="PHP ${PHP_VERSION} on almalinux-minimal container image"
-LABEL description="Provide php on almalinux-minimal container base image"
-LABEL io.k8s.description="PHP with composer"
-LABEL io.k8s.display-name="PHP ${PHP_VERSION}"
-
-COPY --from=builder / /
-
-ENV PATH="${PATH}:${COMPOSER_BIN_DIR}:${COMPOSER_VENDOR_DIR}/bin"
-
-WORKDIR ${SERVER_ROOT}
-
-USER appuser
-
-STOPSIGNAL SIGQUIT
-
-CMD ["/usr/bin/php", "-v"]
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@ -1,94 +0,0 @@
-# PHP 5.6 == 3.6
-# PHP 7.2 == 3.9
-# PHP 7.3 == 3.12
-# PHP 7.4 == 3.15
-# PHP 8.0 == 3.16
-# PHP 8.1 == 3.19
-# PHP 8.2 == 3.21
-# PHP 8.3 == 3.21
-# PHP 8.4 == 3.21
-ARG OS_VERSION=3.21
-
-FROM quay.io/teras/alpine:${OS_VERSION} AS builder
-
-ARG PHP_VERSION=8.4
-ARG PHP_SHORT_VERSION=84
-ARG COMPOSER_VERSION=2.8.9
-
-ENV PHP_VERSION=${PHP_VERSION}
-ENV PHP_SHORT_VERSION=${PHP_SHORT_VERSION}
-ENV COMPOSER_VERSION=${COMPOSER_VERSION}
-ENV SERVER_ROOT=/app
-
-ENV PHP_VERSION=${PHP_VERSION}
-ENV COMPOSER_VERSION=${COMPOSER_VERSION}
-ENV SERVER_ROOT=/app
-
-ENV COMPOSER_HOME=/var/lib/composer
-ENV COMPOSER_ALLOW_SUPERUSER=0
-ENV COMPOSER_NO_INTERACTION=1
-ENV COMPOSER_CACHE_DIR=${COMPOSER_HOME}/cache
-ENV COMPOSER_VENDOR_DIR=${COMPOSER_HOME}/vendor
-ENV COMPOSER_BIN_DIR=${COMPOSER_HOME}/bin
-
-USER root
-WORKDIR ${SERVER_ROOT}
-
-ADD https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar /usr/local/bin/composer
-
-# Create directory, and install required php app
-RUN /bin/mkdir -p ${COMPOSER_CACHE_DIR} ${COMPOSER_VENDOR_DIR} ${COMPOSER_BIN_DIR}; \
-    /bin/chown -R appuser:appuser ${COMPOSER_HOME}; \
-    /sbin/apk add --update --no-cache \
-              php${PHP_SHORT_VERSION} php${PHP_SHORT_VERSION}-common \
-              php${PHP_SHORT_VERSION}-cli php${PHP_SHORT_VERSION}-phar \
-              php${PHP_SHORT_VERSION}-iconv php${PHP_SHORT_VERSION}-mbstring \
-              php${PHP_SHORT_VERSION}-json php${PHP_SHORT_VERSION}-openssl ; \
-    /bin/chmod +rx /usr/local/bin/composer ;
-
-# Create symlinks to /usr/bin/php in case it doesn't exists
-RUN ln -ns /usr/bin/php${PHP_SHORT_VERSION} /usr/bin/php ; exit 0
-
-# CLEAN APK CACHES
-RUN rm -vrf /var/cache/apk/*
-
-FROM scratch
-
-ARG PHP_VERSION=8.4
-ARG COMPOSER_VERSION=2.8.9
-
-# Environment variables for user root
-ENV PHP_VERSION=${PHP_VERSION}
-ENV COMPOSER_VERSION=${COMPOSER_VERSION}
-ENV SERVER_ROOT=/app
-
-ENV COMPOSER_HOME=${SERVER_ROOT}/.composer
-ENV COMPOSER_ALLOW_SUPERUSER=0
-ENV COMPOSER_NO_INTERACTION=1
-ENV COMPOSER_CACHE_DIR=${COMPOSER_HOME}/cache
-ENV COMPOSER_VENDOR_DIR=${COMPOSER_HOME}/vendor
-ENV COMPOSER_BIN_DIR=${COMPOSER_HOME}/bin
-ENV LANG=en_US.UTF-8
-
-LABEL maintainer="Muhamad Aditya Prima <aditya@teraslink.id>"
-LABEL name="php"
-LABEL version="${PHP_VERSION}"
-LABEL distribution-scope="public"
-
-#labels for container catalog
-LABEL summary="PHP ${PHP_VERSION} on alpine linux container image"
-LABEL description="Provide php on alpine linux container base image"
-LABEL io.k8s.description="PHP with composer"
-LABEL io.k8s.display-name="PHP ${PHP_VERSION}"
-
-COPY --from=builder / /
-
-WORKDIR ${SERVER_ROOT}
-
-USER appuser
-
-ENV PATH=${PATH}:${COMPOSER_BIN_DIR}:${COMPOSER_VENDOR_DIR}/bin
-
-STOPSIGNAL SIGQUIT
-
-CMD ["/usr/bin/php", "-v"]
--- a/htdocs/index.html
+++ b/htdocs/index.html
@ -12,15 +12,15 @@
 </head>
 <body>
 <h1>Welcome to httpd!</h1>
-<h2>The teras/php:#version#-apache variant.</h2>
+<h2>The sindigilive/php:#version#-apache--#os# variant.</h2>
 <p>If you see this page, the nginx web server is successfully installed and
 working. Further configuration is required.</p>

 <p>For online documentation and support please refer to
 <a href="https://httpd.apache.org/">httpd.apache.org</a>.</p>

-<p>For online documentation specific to the teras/php:#version#-apache variant,<br/>
-please refer to <a href="https://github.com/aprimediet/docker-php">teras/php</a>.</p>
+<p>For online documentation specific to the sindigilive/php:#version#-apache-#flavor#-#os# variant,<br/>
+please refer to <a href="https://github.com/aprimediet/docker-php">sindigilive/php</a>.</p>

 <p><em>Thank you for using httpd.</em></p>
 </body>