Merge pull request #249 from devilbox/release-0.142

Release 0.142

.github/workflows/action-schedule_master.yml

@@ -0,0 +1,298 @@
+---
+
+# -------------------------------------------------------------------------------------------------
+# Job Name
+# -------------------------------------------------------------------------------------------------
+name: nightly
+
+
+# -------------------------------------------------------------------------------------------------
+# When to run
+# -------------------------------------------------------------------------------------------------
+on:
+  # Nightly: At 00:00 on Monday, Wednesday, and Friday
+  schedule:
+    - cron: '0 18 * * 1,3,5'
+  # Dispatch: allows for manual trigger via GH UI
+  workflow_dispatch:
+
+
+jobs:
+
+  # -----------------------------------------------------------------------------------------------
+  # (1/8) Determine parameter settings
+  # -----------------------------------------------------------------------------------------------
+  params:
+    uses: ./.github/workflows/params-nightly_master.yml
+
+
+  # -----------------------------------------------------------------------------------------------
+  # (2/8) Configure Build and Deploy Matrices
+  # -----------------------------------------------------------------------------------------------
+  configure:
+    needs: [params]
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-configure.yml@master
+    with:
+      enabled: true
+      can_deploy: true
+      versions: ${{ needs.params.outputs.versions }}
+      refs: ${{ needs.params.outputs.refs }}
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+
+  # -----------------------------------------------------------------------------------------------
+  # (3/8) Build & Test base
+  # -----------------------------------------------------------------------------------------------
+  build-base:
+    needs:
+      - configure
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-build.yml@master
+    with:
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      run_tests: false
+      upload_artifact: true
+      pull_base_image: true
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: base
+      stage_prev: ''
+
+  test-base:
+    needs:
+      - configure
+      - build-base
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-test.yml@master
+    with:
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: base
+
+
+  # -----------------------------------------------------------------------------------------------
+  # (4/8) Build & Test mods
+  # -----------------------------------------------------------------------------------------------
+  build-mods:
+    needs:
+      - configure
+      - build-base
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-build.yml@master
+    with:
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      run_tests: false
+      upload_artifact: true
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: mods
+      stage_prev: base
+
+  test-mods:
+    needs:
+      - configure
+      - build-mods
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-test.yml@master
+    with:
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: mods
+
+
+  # -----------------------------------------------------------------------------------------------
+  # (5/8) Build & Test prod
+  # -----------------------------------------------------------------------------------------------
+  build-prod:
+    needs:
+      - configure
+      - build-mods
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-build.yml@master
+    with:
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      run_tests: false
+      upload_artifact: true
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: prod
+      stage_prev: mods
+
+  test-prod:
+    needs:
+      - configure
+      - build-prod
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-test.yml@master
+    with:
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: prod
+
+
+  # -----------------------------------------------------------------------------------------------
+  # (6/8) Build & Test work
+  # -----------------------------------------------------------------------------------------------
+  build-work:
+    needs:
+      - configure
+      - build-prod
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-build.yml@master
+    with:
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      run_tests: false
+      upload_artifact: true
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: work
+      stage_prev: prod
+
+  test-work:
+    needs:
+      - configure
+      - build-work
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-test.yml@master
+    with:
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: work
+
+
+  # -----------------------------------------------------------------------------------------------
+  # (7/8) Push images
+  # -----------------------------------------------------------------------------------------------
+  push-base:
+    needs:
+      - configure
+      - test-base
+      - test-prod
+      - test-mods
+      - test-work
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-push-image.yml@master
+    with:
+      can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: base
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+  push-mods:
+    needs:
+      - configure
+      - test-base
+      - test-prod
+      - test-mods
+      - test-work
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-push-image.yml@master
+    with:
+      can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: mods
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+  push-prod:
+    needs:
+      - configure
+      - test-base
+      - test-prod
+      - test-mods
+      - test-work
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-push-image.yml@master
+    with:
+      can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: prod
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+  push-work:
+    needs:
+      - configure
+      - test-base
+      - test-prod
+      - test-mods
+      - test-work
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-push-image.yml@master
+    with:
+      can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: work
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+
+  # -----------------------------------------------------------------------------------------------
+  # (8/8) Push Manifests
+  # -----------------------------------------------------------------------------------------------
+  manifest-base:
+    needs:
+      - configure
+      - push-base
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-push-manifest.yml@master
+    with:
+      can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_deploy }}
+      versions: ${{ needs.configure.outputs.versions }}
+      stage: base
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+  manifest-mods:
+    needs:
+      - configure
+      - push-mods
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-push-manifest.yml@master
+    with:
+      can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_deploy }}
+      versions: ${{ needs.configure.outputs.versions }}
+      stage: mods
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+  manifest-prod:
+    needs:
+      - configure
+      - push-prod
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-push-manifest.yml@master
+    with:
+      can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_deploy }}
+      versions: ${{ needs.configure.outputs.versions }}
+      stage: prod
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+  manifest-work:
+    needs:
+      - configure
+      - push-work
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-push-manifest.yml@master
+    with:
+      can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_deploy }}
+      versions: ${{ needs.configure.outputs.versions }}
+      stage: work
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}

.github/workflows/action-schedule_tags.yml

@@ -0,0 +1,298 @@
+---
+
+# -------------------------------------------------------------------------------------------------
+# Job Name
+# -------------------------------------------------------------------------------------------------
+name: nightly
+
+
+# -------------------------------------------------------------------------------------------------
+# When to run
+# -------------------------------------------------------------------------------------------------
+on:
+  # Nightly: At 18:00 on Sunday, Tuesday, and Thursday
+  schedule:
+    - cron: '0 18 * * 0,2,4'
+  # Dispatch: allows for manual trigger via GH UI
+  workflow_dispatch:
+
+
+jobs:
+
+  # -----------------------------------------------------------------------------------------------
+  # (1/8) Determine parameter settings
+  # -----------------------------------------------------------------------------------------------
+  params:
+    uses: ./.github/workflows/params-nightly_tags.yml
+
+
+  # -----------------------------------------------------------------------------------------------
+  # (2/8) Configure Build and Deploy Matrices
+  # -----------------------------------------------------------------------------------------------
+  configure:
+    needs: [params]
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-configure.yml@master
+    with:
+      enabled: true
+      can_deploy: true
+      versions: ${{ needs.params.outputs.versions }}
+      refs: ${{ needs.params.outputs.refs }}
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+
+  # -----------------------------------------------------------------------------------------------
+  # (3/8) Build & Test base
+  # -----------------------------------------------------------------------------------------------
+  build-base:
+    needs:
+      - configure
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-build.yml@master
+    with:
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      run_tests: false
+      upload_artifact: true
+      pull_base_image: true
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: base
+      stage_prev: ''
+
+  test-base:
+    needs:
+      - configure
+      - build-base
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-test.yml@master
+    with:
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: base
+
+
+  # -----------------------------------------------------------------------------------------------
+  # (4/8) Build & Test mods
+  # -----------------------------------------------------------------------------------------------
+  build-mods:
+    needs:
+      - configure
+      - build-base
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-build.yml@master
+    with:
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      run_tests: false
+      upload_artifact: true
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: mods
+      stage_prev: base
+
+  test-mods:
+    needs:
+      - configure
+      - build-mods
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-test.yml@master
+    with:
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: mods
+
+
+  # -----------------------------------------------------------------------------------------------
+  # (5/8) Build & Test prod
+  # -----------------------------------------------------------------------------------------------
+  build-prod:
+    needs:
+      - configure
+      - build-mods
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-build.yml@master
+    with:
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      run_tests: false
+      upload_artifact: true
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: prod
+      stage_prev: mods
+
+  test-prod:
+    needs:
+      - configure
+      - build-prod
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-test.yml@master
+    with:
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: prod
+
+
+  # -----------------------------------------------------------------------------------------------
+  # (6/8) Build & Test work
+  # -----------------------------------------------------------------------------------------------
+  build-work:
+    needs:
+      - configure
+      - build-prod
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-build.yml@master
+    with:
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      run_tests: false
+      upload_artifact: true
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: work
+      stage_prev: prod
+
+  test-work:
+    needs:
+      - configure
+      - build-work
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-test.yml@master
+    with:
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: work
+
+
+  # -----------------------------------------------------------------------------------------------
+  # (7/8) Push images
+  # -----------------------------------------------------------------------------------------------
+  push-base:
+    needs:
+      - configure
+      - test-base
+      - test-prod
+      - test-mods
+      - test-work
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-push-image.yml@master
+    with:
+      can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: base
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+  push-mods:
+    needs:
+      - configure
+      - test-base
+      - test-prod
+      - test-mods
+      - test-work
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-push-image.yml@master
+    with:
+      can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: mods
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+  push-prod:
+    needs:
+      - configure
+      - test-base
+      - test-prod
+      - test-mods
+      - test-work
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-push-image.yml@master
+    with:
+      can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: prod
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+  push-work:
+    needs:
+      - configure
+      - test-base
+      - test-prod
+      - test-mods
+      - test-work
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-push-image.yml@master
+    with:
+      can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: work
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+
+  # -----------------------------------------------------------------------------------------------
+  # (8/8) Push Manifests
+  # -----------------------------------------------------------------------------------------------
+  manifest-base:
+    needs:
+      - configure
+      - push-base
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-push-manifest.yml@master
+    with:
+      can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_deploy }}
+      versions: ${{ needs.configure.outputs.versions }}
+      stage: base
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+  manifest-mods:
+    needs:
+      - configure
+      - push-mods
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-push-manifest.yml@master
+    with:
+      can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_deploy }}
+      versions: ${{ needs.configure.outputs.versions }}
+      stage: mods
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+  manifest-prod:
+    needs:
+      - configure
+      - push-prod
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-push-manifest.yml@master
+    with:
+      can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_deploy }}
+      versions: ${{ needs.configure.outputs.versions }}
+      stage: prod
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+  manifest-work:
+    needs:
+      - configure
+      - push-work
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-push-manifest.yml@master
+    with:
+      can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_deploy }}
+      versions: ${{ needs.configure.outputs.versions }}
+      stage: work
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}

.github/workflows/action.yml

@@ -0,0 +1,298 @@
+---
+
+# -------------------------------------------------------------------------------------------------
+# Job Name
+# -------------------------------------------------------------------------------------------------
+name: build
+
+
+# -------------------------------------------------------------------------------------------------
+# When to run
+# -------------------------------------------------------------------------------------------------
+on:
+  # Push or pull_request will be determined in jobs.configure.enabled
+  push:
+  pull_request:
+  # Dispatch: allows for manual trigger via GH UI
+  workflow_dispatch:
+
+
+jobs:
+
+  # -----------------------------------------------------------------------------------------------
+  # (1/8) Determine parameter settings
+  # -----------------------------------------------------------------------------------------------
+  params:
+    uses: ./.github/workflows/params.yml
+
+
+  # -----------------------------------------------------------------------------------------------
+  # (2/8) Configure Build and Deploy Matrices
+  # -----------------------------------------------------------------------------------------------
+  configure:
+    needs: [params]
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-configure.yml@master
+    with:
+      enabled: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && (github.event.pull_request.user.login != 'cytopia')) }}
+      can_deploy: ${{ (github.repository == 'devilbox/docker-php-fpm') && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/release-')) }}
+      versions: ${{ needs.params.outputs.versions }}
+      refs: ${{ needs.params.outputs.refs }}
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+
+  # -----------------------------------------------------------------------------------------------
+  # (3/8) Build & Test base
+  # -----------------------------------------------------------------------------------------------
+  build-base:
+    needs:
+      - configure
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-build.yml@master
+    with:
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      run_tests: false
+      upload_artifact: true
+      pull_base_image: true
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: base
+      stage_prev: ''
+
+  test-base:
+    needs:
+      - configure
+      - build-base
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-test.yml@master
+    with:
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: base
+
+
+  # -----------------------------------------------------------------------------------------------
+  # (4/8) Build & Test mods
+  # -----------------------------------------------------------------------------------------------
+  build-mods:
+    needs:
+      - configure
+      - build-base
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-build.yml@master
+    with:
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      run_tests: false
+      upload_artifact: true
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: mods
+      stage_prev: base
+
+  test-mods:
+    needs:
+      - configure
+      - build-mods
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-test.yml@master
+    with:
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: mods
+
+
+  # -----------------------------------------------------------------------------------------------
+  # (5/8) Build & Test prod
+  # -----------------------------------------------------------------------------------------------
+  build-prod:
+    needs:
+      - configure
+      - build-mods
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-build.yml@master
+    with:
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      run_tests: false
+      upload_artifact: true
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: prod
+      stage_prev: mods
+
+  test-prod:
+    needs:
+      - configure
+      - build-prod
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-test.yml@master
+    with:
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: prod
+
+
+  # -----------------------------------------------------------------------------------------------
+  # (6/8) Build & Test work
+  # -----------------------------------------------------------------------------------------------
+  build-work:
+    needs:
+      - configure
+      - build-prod
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-build.yml@master
+    with:
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      run_tests: false
+      upload_artifact: true
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: work
+      stage_prev: prod
+
+  test-work:
+    needs:
+      - configure
+      - build-work
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-test.yml@master
+    with:
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: work
+
+
+  # -----------------------------------------------------------------------------------------------
+  # (7/8) Push images
+  # -----------------------------------------------------------------------------------------------
+  push-base:
+    needs:
+      - configure
+      - test-base
+      - test-prod
+      - test-mods
+      - test-work
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-push-image.yml@master
+    with:
+      can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: base
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+  push-mods:
+    needs:
+      - configure
+      - test-base
+      - test-prod
+      - test-mods
+      - test-work
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-push-image.yml@master
+    with:
+      can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: mods
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+  push-prod:
+    needs:
+      - configure
+      - test-base
+      - test-prod
+      - test-mods
+      - test-work
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-push-image.yml@master
+    with:
+      can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: prod
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+  push-work:
+    needs:
+      - configure
+      - test-base
+      - test-prod
+      - test-mods
+      - test-work
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-push-image.yml@master
+    with:
+      can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_build }}
+      artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
+      stage: work
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+
+  # -----------------------------------------------------------------------------------------------
+  # (8/8) Push Manifests
+  # -----------------------------------------------------------------------------------------------
+  manifest-base:
+    needs:
+      - configure
+      - push-base
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-push-manifest.yml@master
+    with:
+      can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_deploy }}
+      versions: ${{ needs.configure.outputs.versions }}
+      stage: base
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+  manifest-mods:
+    needs:
+      - configure
+      - push-mods
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-push-manifest.yml@master
+    with:
+      can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_deploy }}
+      versions: ${{ needs.configure.outputs.versions }}
+      stage: mods
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+  manifest-prod:
+    needs:
+      - configure
+      - push-prod
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-push-manifest.yml@master
+    with:
+      can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_deploy }}
+      versions: ${{ needs.configure.outputs.versions }}
+      stage: prod
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+  manifest-work:
+    needs:
+      - configure
+      - push-work
+    uses: devilbox/github-actions/.github/workflows/docker-multistage-push-manifest.yml@master
+    with:
+      can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
+      has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
+      matrix: ${{ needs.configure.outputs.matrix_deploy }}
+      versions: ${{ needs.configure.outputs.versions }}
+      stage: work
+    secrets:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}

.github/workflows/build.yml

@@ -1,348 +0,0 @@
----
-
-# -------------------------------------------------------------------------------------------------
-# Job Name
-# -------------------------------------------------------------------------------------------------
-name: build
-
-
-# -------------------------------------------------------------------------------------------------
-# When to run
-# -------------------------------------------------------------------------------------------------
-on:
-  # Runs on Pull Requests
-  pull_request:
-  # Runs on Push
-  push:
-
-
-# -------------------------------------------------------------------------------------------------
-# What to run
-# -------------------------------------------------------------------------------------------------
-jobs:
-  build:
-    name: "[ PHP-${{ matrix.version }} ]"
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: False
-      matrix:
-        version:
-          - '5.2'
-          - '5.3'
-          - '5.4'
-          - '5.5'
-          - '5.6'
-          - '7.0'
-          - '7.1'
-          - '7.2'
-          - '7.3'
-          - '7.4'
-          - '8.0'
-          - '8.1'
-          - '8.2'
-    steps:
-
-      # ------------------------------------------------------------
-      # Setup repository
-      # ------------------------------------------------------------
-      - name: Checkout repository
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Set variables
-        id: vars
-        run: |
-
-          # Retrieve git info (tags, etc)
-          git fetch --all
-
-          # Branch, Tag or Commit
-          GIT_TYPE="$( \
-            curl -sS https://raw.githubusercontent.com/cytopia/git-tools/master/git-info.sh \
-            | sh \
-            | grep '^GIT_TYPE' \
-            | sed 's|.*=||g' \
-          )"
-          # Branch name, Tag name or Commit Hash
-          GIT_SLUG="$( \
-            curl -sS https://raw.githubusercontent.com/cytopia/git-tools/master/git-info.sh \
-            | sh \
-            | grep '^GIT_NAME' \
-            | sed 's|.*=||g' \
-          )"
-          # Docker Tag
-          if [ "${GIT_TYPE}" = "BRANCH" ] && [ "${GIT_SLUG}" = "master" ]; then
-            DOCKER_TAG_BASE="${VERSION}-base"
-            DOCKER_TAG_MODS="${VERSION}-mods"
-            DOCKER_TAG_PROD="${VERSION}-prod"
-            DOCKER_TAG_WORK="${VERSION}-work"
-          else
-            DOCKER_TAG_BASE="${VERSION}-base-${GIT_SLUG}"
-            DOCKER_TAG_MODS="${VERSION}-mods-${GIT_SLUG}"
-            DOCKER_TAG_PROD="${VERSION}-prod-${GIT_SLUG}"
-            DOCKER_TAG_WORK="${VERSION}-work-${GIT_SLUG}"
-          fi
-
-          # Output
-          echo "GIT_TYPE=${GIT_TYPE}"
-          echo "GIT_SLUG=${GIT_SLUG}"
-          echo "DOCKER_TAG_BASE=${DOCKER_TAG_BASE}"
-          echo "DOCKER_TAG_MODS=${DOCKER_TAG_MODS}"
-          echo "DOCKER_TAG_PROD=${DOCKER_TAG_PROD}"
-          echo "DOCKER_TAG_WORK=${DOCKER_TAG_WORK}"
-
-          # Export variable
-          # https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#environment-files
-          echo "GIT_TYPE=${GIT_TYPE}"               >> ${GITHUB_ENV}
-          echo "GIT_SLUG=${GIT_SLUG}"               >> ${GITHUB_ENV}
-          echo "DOCKER_TAG_BASE=${DOCKER_TAG_BASE}" >> ${GITHUB_ENV}
-          echo "DOCKER_TAG_MODS=${DOCKER_TAG_MODS}" >> ${GITHUB_ENV}
-          echo "DOCKER_TAG_PROD=${DOCKER_TAG_PROD}" >> ${GITHUB_ENV}
-          echo "DOCKER_TAG_WORK=${DOCKER_TAG_WORK}" >> ${GITHUB_ENV}
-        env:
-          VERSION: ${{ matrix.version }}
-
-
-      # ------------------------------------------------------------
-      # Base
-      # ------------------------------------------------------------
-      - name: Build Base
-        run: |
-          retry() {
-            for n in $(seq ${RETRIES}); do
-              echo "[${n}/${RETRIES}] ${*}";
-              if eval "${*}"; then
-                echo "[SUCC] ${n}/${RETRIES}";
-                return 0;
-              fi;
-              sleep ${PAUSE};
-              echo "[FAIL] ${n}/${RETRIES}";
-            done;
-            return 1;
-          }
-          retry make _pull-base-image VERSION=${VERSION}
-          retry make build-base VERSION=${VERSION}
-        env:
-          VERSION: ${{ matrix.version }}
-          RETRIES: 20
-          PAUSE: 10
-
-      - name: Test Base
-        run: |
-          retry() {
-            for n in $(seq ${RETRIES}); do
-              echo "[${n}/${RETRIES}] ${*}";
-              if eval "${*}"; then
-                echo "[SUCC] ${n}/${RETRIES}";
-                return 0;
-              fi;
-              sleep ${PAUSE};
-              echo "[FAIL] ${n}/${RETRIES}";
-            done;
-            return 1;
-          }
-          retry make test-base VERSION=${VERSION}
-        env:
-          VERSION: ${{ matrix.version }}
-          RETRIES: 20
-          PAUSE: 10
-
-
-      # ------------------------------------------------------------
-      # Mods
-      # ------------------------------------------------------------
-      - name: Build Mods
-        run: |
-          retry() {
-            for n in $(seq ${RETRIES}); do
-              echo "[${n}/${RETRIES}] ${*}";
-              if eval "${*}"; then
-                echo "[SUCC] ${n}/${RETRIES}";
-                return 0;
-              fi;
-              sleep ${PAUSE};
-              echo "[FAIL] ${n}/${RETRIES}";
-            done;
-            return 1;
-          }
-          retry make build-mods VERSION=${VERSION}
-        env:
-          VERSION: ${{ matrix.version }}
-          RETRIES: 20
-          PAUSE: 10
-
-      - name: Test Mods
-        run: |
-          retry() {
-            for n in $(seq ${RETRIES}); do
-              echo "[${n}/${RETRIES}] ${*}";
-              if eval "${*}"; then
-                echo "[SUCC] ${n}/${RETRIES}";
-                return 0;
-              fi;
-              sleep ${PAUSE};
-              echo "[FAIL] ${n}/${RETRIES}";
-            done;
-            return 1;
-          }
-          retry make test-mods VERSION=${VERSION}
-        env:
-          VERSION: ${{ matrix.version }}
-          RETRIES: 20
-          PAUSE: 10
-
-
-      # ------------------------------------------------------------
-      # Prod
-      # ------------------------------------------------------------
-      - name: Build Prod
-        run: |
-          retry() {
-            for n in $(seq ${RETRIES}); do
-              echo "[${n}/${RETRIES}] ${*}";
-              if eval "${*}"; then
-                echo "[SUCC] ${n}/${RETRIES}";
-                return 0;
-              fi;
-              sleep ${PAUSE};
-              echo "[FAIL] ${n}/${RETRIES}";
-            done;
-            return 1;
-          }
-          retry make build-prod VERSION=${VERSION}
-        env:
-          VERSION: ${{ matrix.version }}
-          RETRIES: 20
-          PAUSE: 10
-
-      - name: Test Prod
-        run: |
-          retry() {
-            for n in $(seq ${RETRIES}); do
-              echo "[${n}/${RETRIES}] ${*}";
-              if eval "${*}"; then
-                echo "[SUCC] ${n}/${RETRIES}";
-                return 0;
-              fi;
-              sleep ${PAUSE};
-              echo "[FAIL] ${n}/${RETRIES}";
-            done;
-            return 1;
-          }
-          retry make test-prod VERSION=${VERSION}
-        env:
-          VERSION: ${{ matrix.version }}
-          RETRIES: 20
-          PAUSE: 10
-
-
-      # ------------------------------------------------------------
-      # Work
-      # ------------------------------------------------------------
-      - name: Build Work
-        run: |
-          retry() {
-            for n in $(seq ${RETRIES}); do
-              echo "[${n}/${RETRIES}] ${*}";
-              if eval "${*}"; then
-                echo "[SUCC] ${n}/${RETRIES}";
-                return 0;
-              fi;
-              sleep ${PAUSE};
-              echo "[FAIL] ${n}/${RETRIES}";
-            done;
-            return 1;
-          }
-          retry make build-work VERSION=${VERSION}
-        env:
-          VERSION: ${{ matrix.version }}
-          RETRIES: 20
-          PAUSE: 10
-
-      - name: Test Work
-        run: |
-          retry() {
-            for n in $(seq ${RETRIES}); do
-              echo "[${n}/${RETRIES}] ${*}";
-              if eval "${*}"; then
-                echo "[SUCC] ${n}/${RETRIES}";
-                return 0;
-              fi;
-              sleep ${PAUSE};
-              echo "[FAIL] ${n}/${RETRIES}";
-            done;
-            return 1;
-          }
-          retry make test-work VERSION=${VERSION}
-        env:
-          VERSION: ${{ matrix.version }}
-          RETRIES: 20
-          PAUSE: 10
-
-
-      # ------------------------------------------------------------
-      # Diff README.md
-      # ------------------------------------------------------------
-      - name: Diff README.md
-        run: |
-          make gen-readme VERSION=${VERSION}
-          git diff --quiet || { echo "Build Changes"; git diff; git status; false; }
-        env:
-          VERSION: ${{ matrix.version }}
-
-
-      # ------------------------------------------------------------
-      # Deploy
-      # ------------------------------------------------------------
-      - name: Publish images (only repo owner)
-        run: |
-          retry() {
-            for n in $(seq ${RETRIES}); do
-              echo "[${n}/${RETRIES}] ${*}";
-              if eval "${*}"; then
-                echo "[SUCC] ${n}/${RETRIES}";
-                return 0;
-              fi;
-              sleep ${PAUSE};
-              echo "[FAIL] ${n}/${RETRIES}";
-            done;
-            return 1;
-          }
-
-          # Output
-          echo "GIT_TYPE=${GIT_TYPE}"
-          echo "GIT_SLUG=${GIT_SLUG}"
-          echo "DOCKER_TAG_BASE=${DOCKER_TAG_BASE}"
-          echo "DOCKER_TAG_MODS=${DOCKER_TAG_MODS}"
-          echo "DOCKER_TAG_PROD=${DOCKER_TAG_PROD}"
-          echo "DOCKER_TAG_WORK=${DOCKER_TAG_WORK}"
-
-          # Tag image
-          retry make tag OLD_TAG="${VERSION}-base" NEW_TAG="${DOCKER_TAG_BASE}"
-          retry make tag OLD_TAG="${VERSION}-mods" NEW_TAG="${DOCKER_TAG_MODS}"
-          retry make tag OLD_TAG="${VERSION}-prod" NEW_TAG="${DOCKER_TAG_PROD}"
-          retry make tag OLD_TAG="${VERSION}-work" NEW_TAG="${DOCKER_TAG_WORK}"
-          docker images
-
-          # Login
-          retry make login USERNAME=${{ secrets.DOCKERHUB_USERNAME }} PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }}
-
-          # Push
-          retry make push TAG=${DOCKER_TAG_BASE}
-          retry make push TAG=${DOCKER_TAG_MODS}
-          retry make push TAG=${DOCKER_TAG_PROD}
-          retry make push TAG=${DOCKER_TAG_WORK}
-        env:
-          VERSION: ${{ matrix.version }}
-          RETRIES: 20
-          PAUSE: 10
-        # https://help.github.com/en/github/automating-your-workflow-with-github-actions/contexts-and-expression-syntax-for-github-actions#functions
-        if: github.event.pull_request.base.repo.id == github.event.pull_request.head.repo.id
-            && (
-              (github.event_name == 'schedule' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')))
-              ||
-              (github.event_name == 'push'     && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')))
-              ||
-              (github.event_name == 'push'     && startsWith(github.ref, 'refs/heads/release-'))
-            )

.github/workflows/linting.yml

@@ -11,6 +11,7 @@ name: lint
 # -------------------------------------------------------------------------------------------------
 on:
   # Runs on Pull Requests
+  workflow_dispatch:
   pull_request:
 
 
@@ -41,10 +42,6 @@ jobs:
         run: |
           make lint-yaml
 
-      - name: Lint workflow
-        run: |
-          make lint-workflow
-
       - name: Lint Changelog
         run: |
           make lint-changelog

.github/workflows/nightly.yml

@@ -1,351 +0,0 @@
----
-
-# -------------------------------------------------------------------------------------------------
-# Job Name
-# -------------------------------------------------------------------------------------------------
-name: nightly
-
-
-# -------------------------------------------------------------------------------------------------
-# When to run
-# -------------------------------------------------------------------------------------------------
-on:
-  # Runs daily
-  schedule:
-    - cron: '0 0 * * *'
-
-
-# -------------------------------------------------------------------------------------------------
-# What to run
-# -------------------------------------------------------------------------------------------------
-jobs:
-  nightly:
-    name: "[ PHP-${{ matrix.version }} ] (ref: ${{ matrix.refs }})"
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: False
-      matrix:
-        version:
-          - '5.2'
-          - '5.3'
-          - '5.4'
-          - '5.5'
-          - '5.6'
-          - '7.0'
-          - '7.1'
-          - '7.2'
-          - '7.3'
-          - '7.4'
-          - '8.0'
-          - '8.1'
-          - '8.2'
-        refs:
-          - 'master'
-          - '0.136'
-    steps:
-
-      # ------------------------------------------------------------
-      # Setup repository
-      # ------------------------------------------------------------
-      - name: Checkout repository
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-          ref: ${{ matrix.refs }}
-
-      - name: Set variables
-        id: vars
-        run: |
-
-          # Retrieve git info (tags, etc)
-          git fetch --all
-
-          # Branch, Tag or Commit
-          GIT_TYPE="$( \
-            curl -sS https://raw.githubusercontent.com/cytopia/git-tools/master/git-info.sh \
-            | sh \
-            | grep '^GIT_TYPE' \
-            | sed 's|.*=||g' \
-          )"
-          # Branch name, Tag name or Commit Hash
-          GIT_SLUG="$( \
-            curl -sS https://raw.githubusercontent.com/cytopia/git-tools/master/git-info.sh \
-            | sh \
-            | grep '^GIT_NAME' \
-            | sed 's|.*=||g' \
-          )"
-          # Docker Tag
-          if [ "${GIT_TYPE}" = "BRANCH" ] && [ "${GIT_SLUG}" = "master" ]; then
-            DOCKER_TAG_BASE="${VERSION}-base"
-            DOCKER_TAG_MODS="${VERSION}-mods"
-            DOCKER_TAG_PROD="${VERSION}-prod"
-            DOCKER_TAG_WORK="${VERSION}-work"
-          else
-            DOCKER_TAG_BASE="${VERSION}-base-${GIT_SLUG}"
-            DOCKER_TAG_MODS="${VERSION}-mods-${GIT_SLUG}"
-            DOCKER_TAG_PROD="${VERSION}-prod-${GIT_SLUG}"
-            DOCKER_TAG_WORK="${VERSION}-work-${GIT_SLUG}"
-          fi
-
-          # Output
-          echo "GIT_TYPE=${GIT_TYPE}"
-          echo "GIT_SLUG=${GIT_SLUG}"
-          echo "DOCKER_TAG_BASE=${DOCKER_TAG_BASE}"
-          echo "DOCKER_TAG_MODS=${DOCKER_TAG_MODS}"
-          echo "DOCKER_TAG_PROD=${DOCKER_TAG_PROD}"
-          echo "DOCKER_TAG_WORK=${DOCKER_TAG_WORK}"
-
-          # Export variable
-          # https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#environment-files
-          echo "GIT_TYPE=${GIT_TYPE}"               >> ${GITHUB_ENV}
-          echo "GIT_SLUG=${GIT_SLUG}"               >> ${GITHUB_ENV}
-          echo "DOCKER_TAG_BASE=${DOCKER_TAG_BASE}" >> ${GITHUB_ENV}
-          echo "DOCKER_TAG_MODS=${DOCKER_TAG_MODS}" >> ${GITHUB_ENV}
-          echo "DOCKER_TAG_PROD=${DOCKER_TAG_PROD}" >> ${GITHUB_ENV}
-          echo "DOCKER_TAG_WORK=${DOCKER_TAG_WORK}" >> ${GITHUB_ENV}
-        env:
-          VERSION: ${{ matrix.version }}
-
-
-      # ------------------------------------------------------------
-      # Base
-      # ------------------------------------------------------------
-      - name: Build Base
-        run: |
-          retry() {
-            for n in $(seq ${RETRIES}); do
-              echo "[${n}/${RETRIES}] ${*}";
-              if eval "${*}"; then
-                echo "[SUCC] ${n}/${RETRIES}";
-                return 0;
-              fi;
-              sleep ${PAUSE};
-              echo "[FAIL] ${n}/${RETRIES}";
-            done;
-            return 1;
-          }
-          retry make _pull-base-image VERSION=${VERSION}
-          retry make build-base VERSION=${VERSION}
-        env:
-          VERSION: ${{ matrix.version }}
-          RETRIES: 20
-          PAUSE: 10
-
-      - name: Test Base
-        run: |
-          retry() {
-            for n in $(seq ${RETRIES}); do
-              echo "[${n}/${RETRIES}] ${*}";
-              if eval "${*}"; then
-                echo "[SUCC] ${n}/${RETRIES}";
-                return 0;
-              fi;
-              sleep ${PAUSE};
-              echo "[FAIL] ${n}/${RETRIES}";
-            done;
-            return 1;
-          }
-          retry make test-base VERSION=${VERSION}
-        env:
-          VERSION: ${{ matrix.version }}
-          RETRIES: 20
-          PAUSE: 10
-
-
-      # ------------------------------------------------------------
-      # Mods
-      # ------------------------------------------------------------
-      - name: Build Mods
-        run: |
-          retry() {
-            for n in $(seq ${RETRIES}); do
-              echo "[${n}/${RETRIES}] ${*}";
-              if eval "${*}"; then
-                echo "[SUCC] ${n}/${RETRIES}";
-                return 0;
-              fi;
-              sleep ${PAUSE};
-              echo "[FAIL] ${n}/${RETRIES}";
-            done;
-            return 1;
-          }
-          retry make build-mods VERSION=${VERSION}
-        env:
-          VERSION: ${{ matrix.version }}
-          RETRIES: 20
-          PAUSE: 10
-
-      - name: Test Mods
-        run: |
-          retry() {
-            for n in $(seq ${RETRIES}); do
-              echo "[${n}/${RETRIES}] ${*}";
-              if eval "${*}"; then
-                echo "[SUCC] ${n}/${RETRIES}";
-                return 0;
-              fi;
-              sleep ${PAUSE};
-              echo "[FAIL] ${n}/${RETRIES}";
-            done;
-            return 1;
-          }
-          retry make test-mods VERSION=${VERSION}
-        env:
-          VERSION: ${{ matrix.version }}
-          RETRIES: 20
-          PAUSE: 10
-
-
-      # ------------------------------------------------------------
-      # Prod
-      # ------------------------------------------------------------
-      - name: Build Prod
-        run: |
-          retry() {
-            for n in $(seq ${RETRIES}); do
-              echo "[${n}/${RETRIES}] ${*}";
-              if eval "${*}"; then
-                echo "[SUCC] ${n}/${RETRIES}";
-                return 0;
-              fi;
-              sleep ${PAUSE};
-              echo "[FAIL] ${n}/${RETRIES}";
-            done;
-            return 1;
-          }
-          retry make build-prod VERSION=${VERSION}
-        env:
-          VERSION: ${{ matrix.version }}
-          RETRIES: 20
-          PAUSE: 10
-
-      - name: Test Prod
-        run: |
-          retry() {
-            for n in $(seq ${RETRIES}); do
-              echo "[${n}/${RETRIES}] ${*}";
-              if eval "${*}"; then
-                echo "[SUCC] ${n}/${RETRIES}";
-                return 0;
-              fi;
-              sleep ${PAUSE};
-              echo "[FAIL] ${n}/${RETRIES}";
-            done;
-            return 1;
-          }
-          retry make test-prod VERSION=${VERSION}
-        env:
-          VERSION: ${{ matrix.version }}
-          RETRIES: 20
-          PAUSE: 10
-
-
-      # ------------------------------------------------------------
-      # Work
-      # ------------------------------------------------------------
-      - name: Build Work
-        run: |
-          retry() {
-            for n in $(seq ${RETRIES}); do
-              echo "[${n}/${RETRIES}] ${*}";
-              if eval "${*}"; then
-                echo "[SUCC] ${n}/${RETRIES}";
-                return 0;
-              fi;
-              sleep ${PAUSE};
-              echo "[FAIL] ${n}/${RETRIES}";
-            done;
-            return 1;
-          }
-          retry make build-work VERSION=${VERSION}
-        env:
-          VERSION: ${{ matrix.version }}
-          RETRIES: 20
-          PAUSE: 10
-
-      - name: Test Work
-        run: |
-          retry() {
-            for n in $(seq ${RETRIES}); do
-              echo "[${n}/${RETRIES}] ${*}";
-              if eval "${*}"; then
-                echo "[SUCC] ${n}/${RETRIES}";
-                return 0;
-              fi;
-              sleep ${PAUSE};
-              echo "[FAIL] ${n}/${RETRIES}";
-            done;
-            return 1;
-          }
-          retry make test-work VERSION=${VERSION}
-        env:
-          VERSION: ${{ matrix.version }}
-          RETRIES: 20
-          PAUSE: 10
-
-
-      # ------------------------------------------------------------
-      # Diff README.md
-      # ------------------------------------------------------------
-      - name: Diff README.md
-        run: |
-          make gen-readme VERSION=${VERSION}
-          git diff --quiet || { echo "Build Changes"; git diff; git status; false; }
-        env:
-          VERSION: ${{ matrix.version }}
-
-
-      # ------------------------------------------------------------
-      # Deploy
-      # ------------------------------------------------------------
-      - name: Publish images (only repo owner)
-        run: |
-          retry() {
-            for n in $(seq ${RETRIES}); do
-              echo "[${n}/${RETRIES}] ${*}";
-              if eval "${*}"; then
-                echo "[SUCC] ${n}/${RETRIES}";
-                return 0;
-              fi;
-              sleep ${PAUSE};
-              echo "[FAIL] ${n}/${RETRIES}";
-            done;
-            return 1;
-          }
-
-          # Output
-          echo "GIT_TYPE=${GIT_TYPE}"
-          echo "GIT_SLUG=${GIT_SLUG}"
-          echo "DOCKER_TAG_BASE=${DOCKER_TAG_BASE}"
-          echo "DOCKER_TAG_MODS=${DOCKER_TAG_MODS}"
-          echo "DOCKER_TAG_PROD=${DOCKER_TAG_PROD}"
-          echo "DOCKER_TAG_WORK=${DOCKER_TAG_WORK}"
-
-          # Tag image
-          retry make tag OLD_TAG="${VERSION}-base" NEW_TAG="${DOCKER_TAG_BASE}"
-          retry make tag OLD_TAG="${VERSION}-mods" NEW_TAG="${DOCKER_TAG_MODS}"
-          retry make tag OLD_TAG="${VERSION}-prod" NEW_TAG="${DOCKER_TAG_PROD}"
-          retry make tag OLD_TAG="${VERSION}-work" NEW_TAG="${DOCKER_TAG_WORK}"
-          docker images
-
-          # Login
-          retry make login USERNAME=${{ secrets.DOCKERHUB_USERNAME }} PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }}
-
-          # Push
-          retry make push TAG=${DOCKER_TAG_BASE}
-          retry make push TAG=${DOCKER_TAG_MODS}
-          retry make push TAG=${DOCKER_TAG_PROD}
-          retry make push TAG=${DOCKER_TAG_WORK}
-        env:
-          VERSION: ${{ matrix.version }}
-          RETRIES: 20
-          PAUSE: 10
-        # https://help.github.com/en/github/automating-your-workflow-with-github-actions/contexts-and-expression-syntax-for-github-actions#functions
-        if: github.event.pull_request.base.repo.id == github.event.pull_request.head.repo.id
-            && (
-              (github.event_name == 'schedule' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')))
-              ||
-              (github.event_name == 'push'     && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')))
-              ||
-              (github.event_name == 'push'     && startsWith(github.ref, 'refs/heads/release-'))
-            )

.github/workflows/params-nightly_master.yml

@@ -0,0 +1,71 @@
+---
+
+# -------------------------------------------------------------------------------------------------
+# Job Name
+# -------------------------------------------------------------------------------------------------
+name: params
+
+
+# -------------------------------------------------------------------------------------------------
+# Custom Variables
+# -------------------------------------------------------------------------------------------------
+env:
+  VERSIONS: >
+    [
+      {
+        "NAME":    "PHP",
+        "VERSION": ["5.2"],
+        "FLAVOUR": ["default"],
+        "ARCH":    ["linux/amd64"]
+      },
+      {
+        "NAME":    "PHP",
+        "VERSION": ["5.3", "5.4", "5.5", "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2"],
+        "FLAVOUR": ["default"],
+        "ARCH":    ["linux/amd64", "linux/arm64"]
+      }
+    ]
+  REFS: >
+    {
+        "DEFAULT_BRANCH": "master",
+        "BRANCHES": "master",
+        "NUM_LATEST_TAGS": 0
+    }
+
+
+# -------------------------------------------------------------------------------------------------
+# When to run
+# -------------------------------------------------------------------------------------------------
+on:
+  workflow_call:
+    ###
+    ### OUTPUTS
+    ###
+    outputs:
+      versions:
+        description: "JSON string for versions. Use via: fromJson(needs.params.versions)"
+        value: ${{ jobs.params.outputs.versions }}
+      refs:
+        description: "JSON string for refs. Use via: fromJson(needs.params.refs)"
+        value: ${{ jobs.params.outputs.refs }}
+
+jobs:
+  params:
+    runs-on: ubuntu-latest
+
+    outputs:
+      versions: ${{ steps.set-versions.outputs.versions }}
+      refs: ${{ steps.set-refs.outputs.refs }}
+
+    steps:
+      - name: "[Set-Output] jsonify VERSIONS"
+        id: set-versions
+        run: |
+          VERSIONS="$( echo '${{ env.VERSIONS }}' | jq -M -c )"
+          echo "versions=${VERSIONS}" >> $GITHUB_OUTPUT
+
+      - name: "[Set-Output] jsonify REFS"
+        id: set-refs
+        run: |
+          REFS="$( echo '${{ env.REFS }}' | jq -M -c )"
+          echo "refs=${REFS}" >> $GITHUB_OUTPUT

.github/workflows/params-nightly_tags.yml

@@ -0,0 +1,71 @@
+---
+
+# -------------------------------------------------------------------------------------------------
+# Job Name
+# -------------------------------------------------------------------------------------------------
+name: params
+
+
+# -------------------------------------------------------------------------------------------------
+# Custom Variables
+# -------------------------------------------------------------------------------------------------
+env:
+  VERSIONS: >
+    [
+      {
+        "NAME":    "PHP",
+        "VERSION": ["5.2"],
+        "FLAVOUR": ["default"],
+        "ARCH":    ["linux/amd64"]
+      },
+      {
+        "NAME":    "PHP",
+        "VERSION": ["5.3", "5.4", "5.5", "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2"],
+        "FLAVOUR": ["default"],
+        "ARCH":    ["linux/amd64", "linux/arm64"]
+      }
+    ]
+  REFS: >
+    {
+        "DEFAULT_BRANCH": "master",
+        "BRANCHES": "",
+        "NUM_LATEST_TAGS": 1
+    }
+
+
+# -------------------------------------------------------------------------------------------------
+# When to run
+# -------------------------------------------------------------------------------------------------
+on:
+  workflow_call:
+    ###
+    ### OUTPUTS
+    ###
+    outputs:
+      versions:
+        description: "JSON string for versions. Use via: fromJson(needs.params.versions)"
+        value: ${{ jobs.params.outputs.versions }}
+      refs:
+        description: "JSON string for refs. Use via: fromJson(needs.params.refs)"
+        value: ${{ jobs.params.outputs.refs }}
+
+jobs:
+  params:
+    runs-on: ubuntu-latest
+
+    outputs:
+      versions: ${{ steps.set-versions.outputs.versions }}
+      refs: ${{ steps.set-refs.outputs.refs }}
+
+    steps:
+      - name: "[Set-Output] jsonify VERSIONS"
+        id: set-versions
+        run: |
+          VERSIONS="$( echo '${{ env.VERSIONS }}' | jq -M -c )"
+          echo "versions=${VERSIONS}" >> $GITHUB_OUTPUT
+
+      - name: "[Set-Output] jsonify REFS"
+        id: set-refs
+        run: |
+          REFS="$( echo '${{ env.REFS }}' | jq -M -c )"
+          echo "refs=${REFS}" >> $GITHUB_OUTPUT

.github/workflows/params.yml

@@ -0,0 +1,71 @@
+---
+
+# -------------------------------------------------------------------------------------------------
+# Job Name
+# -------------------------------------------------------------------------------------------------
+name: params
+
+
+# -------------------------------------------------------------------------------------------------
+# Custom Variables
+# -------------------------------------------------------------------------------------------------
+env:
+  VERSIONS: >
+    [
+      {
+        "NAME":    "PHP",
+        "VERSION": ["5.2"],
+        "FLAVOUR": ["default"],
+        "ARCH":    ["linux/amd64"]
+      },
+      {
+        "NAME":    "PHP",
+        "VERSION": ["5.3", "5.4", "5.5", "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2"],
+        "FLAVOUR": ["default"],
+        "ARCH":    ["linux/amd64", "linux/arm64"]
+      }
+    ]
+  REFS: >
+    {
+        "DEFAULT_BRANCH": "master",
+        "BRANCHES": "",
+        "NUM_LATEST_TAGS": 0
+    }
+
+
+# -------------------------------------------------------------------------------------------------
+# When to run
+# -------------------------------------------------------------------------------------------------
+on:
+  workflow_call:
+    ###
+    ### OUTPUTS
+    ###
+    outputs:
+      versions:
+        description: "JSON string for versions. Use via: fromJson(needs.params.versions)"
+        value: ${{ jobs.params.outputs.versions }}
+      refs:
+        description: "JSON string for refs. Use via: fromJson(needs.params.refs)"
+        value: ${{ jobs.params.outputs.refs }}
+
+jobs:
+  params:
+    runs-on: ubuntu-latest
+
+    outputs:
+      versions: ${{ steps.set-versions.outputs.versions }}
+      refs: ${{ steps.set-refs.outputs.refs }}
+
+    steps:
+      - name: "[Set-Output] jsonify VERSIONS"
+        id: set-versions
+        run: |
+          VERSIONS="$( echo '${{ env.VERSIONS }}' | jq -M -c )"
+          echo "versions=${VERSIONS}" >> $GITHUB_OUTPUT
+
+      - name: "[Set-Output] jsonify REFS"
+        id: set-refs
+        run: |
+          REFS="$( echo '${{ env.REFS }}' | jq -M -c )"
+          echo "refs=${REFS}" >> $GITHUB_OUTPUT

.gitignore

@@ -1,74 +1,3 @@
-######################################
-# CUSTOM
-######################################
-
 build/ansible/*.retry
-
-
-
-######################################
-# GENERIC
-######################################
-
-###### std ######
-.lock
-*.log
-
-###### patches/diffs ######
-*.patch
-*.diff
-*.orig
-*.rej
-
-
-######################################
-# Operating Systems
-######################################
-
-###### OSX ######
-._*
-.DS*
-.Spotlight-V100
-.Trashes
-
-###### Windows ######
-Thumbs.db
-ehthumbs.db
-Desktop.ini
-$RECYCLE.BIN/
-*.lnk
-
-
-######################################
-# Editors
-######################################
-
-###### Sublime ######
-*.sublime-workspace
-*.sublime-project
-
-###### Eclipse ######
-.classpath
-.buildpath
-.project
-.settings/
-
-###### Netbeans ######
-nbproject/private/
-
-###### Intellij IDE ######
-.idea/
-.idea_modules/
-
-###### vim ######
-*.swp
-*.swo
-*~
-
-###### TextMate ######
-.tm_properties
-*.tmproj
-
-###### BBEdit ######
-*.bbprojectd
-*.bbproject
+Makefile.docker
+Makefile.lint

CHANGELOG.md

@@ -4,6 +4,71 @@
 ## Unreleased
 
 
+## Release 0.142
+
+### Fixed
+- Fixed `phalcon` module
+- Fixed `swoole` module
+- Fixed installation of wkhtmltopdf [#245](https://github.com/devilbox/docker-php-fpm/pull/245)
+- FIxed installation of drupalconsole [#246](https://github.com/devilbox/docker-php-fpm/pull/246)
+- Fixed installation of symfoni cli [#247](https://github.com/devilbox/docker-php-fpm/pull/247)
+- Fixed installation of NodeJS
+- Fixed installation of PostgreSQL client for PHP 5.6
+- Fixed installation of PostgreSQL client for PHP 7.0
+- Disabled Phalcon Devtools for PHP 7.4 as it breaks
+
+
+## Release 0.141
+
+### Fixed
+- Fixed correct permission for `/opt/nvm` during startup
+
+
+## Release 0.140
+
+### Changed
+- Ensure apt Jessie repositories are trusted beyond EOL
+
+
+## Release 0.139
+
+#### Added
+- (Re-)added mongodb command line client
+- (Re-)added postgresql command line client
+
+### Changed
+- Speed up `xargs` commands by using multi-CPU
+- Use buildkit for building
+
+
+## Release 0.138
+
+#### Added
+- Added arm64 support
+- Added `vips` module for PHP 8.0
+- Added `vips` module for PHP 8.1
+- Added `swoole` module for PHP 8.1
+
+#### Changed
+- Separated nightly jobs
+
+
+## Release 0.137
+
+#### Fixed
+- Fixed imklog: cannot open kernel log (/proc/kmsg): Operation not permitted.
+
+#### Changed
+- Ensured CI tests are platform agnostic (amd64 vs arm64)
+- Ensured CI pipeline will work for long-running jobs
+
+#### Removed
+- Removed homebrew due to arm64 issues
+- Removed postgres cmd client and apt repositories due to arm64 issues
+- Removed mongodb cmd client and apt repositories due to arm64 issues
+- Removed Ansible due to arm64 issues
+
+
 ## Release 0.136
 
 #### Fixed

Dockerfiles/base/Dockerfile-5.2

@@ -44,8 +44,8 @@ RUN set -eux \
 ### Upgrade (install ps)
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		dpkg-dev \
 		procps \
 	&& rm -rf /var/lib/apt/lists/*

Dockerfiles/base/Dockerfile-5.3

@@ -44,8 +44,8 @@ RUN set -eux \
 ### Upgrade (install ps)
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		dpkg-dev \
 		procps \
 	&& rm -rf /var/lib/apt/lists/*

Dockerfiles/base/Dockerfile-5.4

@@ -44,8 +44,8 @@ RUN set -eux \
 ### Upgrade (install ps)
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		dpkg-dev \
 		procps \
 	&& rm -rf /var/lib/apt/lists/*

Dockerfiles/base/Dockerfile-5.5

@@ -44,8 +44,8 @@ RUN set -eux \
 ### Upgrade (install ps)
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		dpkg-dev \
 		procps \
 	&& rm -rf /var/lib/apt/lists/*

Dockerfiles/base/Dockerfile-5.6

@@ -44,8 +44,8 @@ RUN set -eux \
 ### Upgrade (install ps)
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		dpkg-dev \
 		procps \
 	&& rm -rf /var/lib/apt/lists/*

Dockerfiles/base/Dockerfile-7.0

@@ -44,8 +44,8 @@ RUN set -eux \
 ### Upgrade (install ps)
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		dpkg-dev \
 		procps \
 	&& rm -rf /var/lib/apt/lists/*

Dockerfiles/base/Dockerfile-7.1

@@ -44,8 +44,8 @@ RUN set -eux \
 ### Upgrade (install ps)
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		dpkg-dev \
 		procps \
 	&& rm -rf /var/lib/apt/lists/*

Dockerfiles/base/Dockerfile-7.2

@@ -44,8 +44,8 @@ RUN set -eux \
 ### Upgrade (install ps)
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		dpkg-dev \
 		procps \
 	&& rm -rf /var/lib/apt/lists/*

Dockerfiles/base/Dockerfile-7.3

@@ -44,8 +44,8 @@ RUN set -eux \
 ### Upgrade (install ps)
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		dpkg-dev \
 		procps \
 	&& rm -rf /var/lib/apt/lists/*

Dockerfiles/base/Dockerfile-7.4

@@ -44,8 +44,8 @@ RUN set -eux \
 ### Upgrade (install ps)
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		dpkg-dev \
 		procps \
 	&& rm -rf /var/lib/apt/lists/*

Dockerfiles/base/Dockerfile-8.0

@@ -44,8 +44,8 @@ RUN set -eux \
 ### Upgrade (install ps)
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		dpkg-dev \
 		procps \
 	&& rm -rf /var/lib/apt/lists/*

Dockerfiles/base/Dockerfile-8.1

@@ -44,8 +44,8 @@ RUN set -eux \
 ### Upgrade (install ps)
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		dpkg-dev \
 		procps \
 	&& rm -rf /var/lib/apt/lists/*

Dockerfiles/base/Dockerfile-8.2

@@ -44,8 +44,8 @@ RUN set -eux \
 ### Upgrade (install ps)
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		dpkg-dev \
 		procps \
 	&& rm -rf /var/lib/apt/lists/*

Dockerfiles/mods/Dockerfile-5.2

@@ -6,9 +6,8 @@ FROM devilbox/php-fpm:5.2-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		firebird-dev \
 		freetds-dev \
 		libbz2-dev \
@@ -64,7 +63,8 @@ RUN set -eux \
 		patch \
 		pkg-config \
 		re2c \
-		xz-utils
+		xz-utils \
+	&& rm -rf /var/lib/apt/lists/*
 
 
 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -553,9 +553,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
@@ -583,25 +583,15 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.2-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 	libaspell15 \
 	libc-client2007e \
 	libenchant1c2a \
+	libevent-2.0-5 \
 	libfbclient2 \
 	libfreetype6 \
 	libicu52 \
@@ -629,7 +619,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 ###
 ### Verify

Dockerfiles/mods/Dockerfile-5.3

@@ -6,14 +6,14 @@ FROM devilbox/php-fpm:5.3-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		alien \
 		firebird-dev \
 		freetds-dev \
 		libaio-dev \
 		libbz2-dev \
+		libc-ares-dev \
 		libc-client-dev \
 		libcurl4-openssl-dev \
 		libenchant-dev \
@@ -70,7 +70,8 @@ RUN set -eux \
 		patch \
 		pkg-config \
 		re2c \
-		xz-utils
+		xz-utils \
+	&& rm -rf /var/lib/apt/lists/*
 
 
 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -347,9 +348,9 @@ RUN set -eux \
 && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \
 \
 && rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 && alien \
   -v \
@@ -523,17 +524,6 @@ RUN set -eux \
 	&& true
 
 
-# -------------------- Installing PHP Extension: swoole --------------------
-RUN set -eux \
-	# Installation: Version specific
-	# Type:         PECL extension
-	# Default:      Pecl command
-	&& pecl install swoole-1.9.23 \
-	# Enabling
-	&& docker-php-ext-enable swoole \
-	&& true
-
-
 # -------------------- Installing PHP Extension: sysvmsg --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -650,6 +640,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: swoole --------------------
+RUN set -eux \
+	# Installation: Version specific
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install swoole-1.9.23 \
+	# Enabling
+	&& docker-php-ext-enable swoole \
+	&& true
+
+
 
 
 # Fix php.ini settings for enabled extensions
@@ -662,9 +663,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
@@ -692,26 +693,17 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.3-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 	libaio1 \
 	libaspell15 \
+	libc-ares2 \
 	libc-client2007e \
 	libenchant1c2a \
+	libevent-2.0-5 \
 	libfbclient2 \
 	libfreetype6 \
 	libicu52 \
@@ -725,6 +717,7 @@ RUN set -eux \
 	librabbitmq1 \
 	librdkafka1 \
 	librecode0 \
+	libssl1.0.0 \
 	libsybdb5 \
 	libtidy-0.99-0 \
 	libvpx1 \
@@ -742,7 +735,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 RUN set -eux \
 	# ---------- oci8 ----------
@@ -904,8 +908,6 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^sockets$' \
 	&& php -m | grep -oiE '^spl$' \
 	&& php-fpm -m | grep -oiE '^spl$' \
-	&& php -m | grep -oiE '^swoole$' \
-	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \
 	&& php-fpm -m | grep -oiE '^sysvmsg$' \
 	&& php -m | grep -oiE '^sysvsem$' \
@@ -938,6 +940,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^yaml$' \
 	&& php -m | grep -oiE '^zip$' \
 	&& php-fpm -m | grep -oiE '^zip$' \
+	&& php -m | grep -oiE '^swoole$' \
+	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& true
 
 

Dockerfiles/mods/Dockerfile-5.4

@@ -6,14 +6,14 @@ FROM devilbox/php-fpm:5.4-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		alien \
 		firebird-dev \
 		freetds-dev \
 		libaio-dev \
 		libbz2-dev \
+		libc-ares-dev \
 		libc-client-dev \
 		libcurl4-openssl-dev \
 		libenchant-dev \
@@ -70,7 +70,8 @@ RUN set -eux \
 		patch \
 		pkg-config \
 		re2c \
-		xz-utils
+		xz-utils \
+	&& rm -rf /var/lib/apt/lists/*
 
 
 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -347,9 +348,9 @@ RUN set -eux \
 && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \
 \
 && rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 && alien \
   -v \
@@ -534,17 +535,6 @@ RUN set -eux \
 	&& true
 
 
-# -------------------- Installing PHP Extension: swoole --------------------
-RUN set -eux \
-	# Installation: Version specific
-	# Type:         PECL extension
-	# Default:      Pecl command
-	&& pecl install swoole-1.9.23 \
-	# Enabling
-	&& docker-php-ext-enable swoole \
-	&& true
-
-
 # -------------------- Installing PHP Extension: sysvmsg --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -661,6 +651,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: swoole --------------------
+RUN set -eux \
+	# Installation: Version specific
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install swoole-1.9.23 \
+	# Enabling
+	&& docker-php-ext-enable swoole \
+	&& true
+
+
 
 
 # Fix php.ini settings for enabled extensions
@@ -673,9 +674,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
@@ -703,26 +704,17 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.4-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 	libaio1 \
 	libaspell15 \
+	libc-ares2 \
 	libc-client2007e \
 	libenchant1c2a \
+	libevent-2.0-5 \
 	libfbclient2 \
 	libfreetype6 \
 	libicu52 \
@@ -736,6 +728,7 @@ RUN set -eux \
 	librabbitmq1 \
 	librdkafka1 \
 	librecode0 \
+	libssl1.0.0 \
 	libsybdb5 \
 	libtidy-0.99-0 \
 	libvpx1 \
@@ -753,7 +746,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 RUN set -eux \
 	# ---------- oci8 ----------
@@ -917,8 +921,6 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^sockets$' \
 	&& php -m | grep -oiE '^spl$' \
 	&& php-fpm -m | grep -oiE '^spl$' \
-	&& php -m | grep -oiE '^swoole$' \
-	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \
 	&& php-fpm -m | grep -oiE '^sysvmsg$' \
 	&& php -m | grep -oiE '^sysvsem$' \
@@ -951,6 +953,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^yaml$' \
 	&& php -m | grep -oiE '^zip$' \
 	&& php-fpm -m | grep -oiE '^zip$' \
+	&& php -m | grep -oiE '^swoole$' \
+	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& true
 
 

Dockerfiles/mods/Dockerfile-5.5

@@ -6,15 +6,15 @@ FROM devilbox/php-fpm:5.5-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		alien \
 		firebird-dev \
 		freetds-dev \
 		ghostscript \
 		libaio-dev \
 		libbz2-dev \
+		libc-ares-dev \
 		libc-client-dev \
 		libcurl4-openssl-dev \
 		libenchant-dev \
@@ -72,7 +72,8 @@ RUN set -eux \
 		patch \
 		pkg-config \
 		re2c \
-		xz-utils
+		xz-utils \
+	&& rm -rf /var/lib/apt/lists/*
 
 
 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -95,7 +96,7 @@ RUN set -eux \
 	# Type:         Custom extension
 	&& EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \
 && if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \
-&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \
+&& curl -sS --fail -k https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \
 && tar xvfz ioncube.tar.gz \
 && cd ioncube \
 && cp "ioncube_loader_lin_5.5.so" "${EXTENSION_DIR}/ioncube.so" \
@@ -388,9 +389,9 @@ RUN set -eux \
 && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \
 \
 && rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 && alien \
   -v \
@@ -572,17 +573,6 @@ RUN set -eux \
 	&& true
 
 
-# -------------------- Installing PHP Extension: swoole --------------------
-RUN set -eux \
-	# Installation: Version specific
-	# Type:         PECL extension
-	# Default:      Pecl command
-	&& pecl install swoole-1.9.23 \
-	# Enabling
-	&& docker-php-ext-enable swoole \
-	&& true
-
-
 # -------------------- Installing PHP Extension: sysvmsg --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -699,6 +689,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: swoole --------------------
+RUN set -eux \
+	# Installation: Version specific
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install swoole-1.9.23 \
+	# Enabling
+	&& docker-php-ext-enable swoole \
+	&& true
+
+
 
 
 # Fix php.ini settings for enabled extensions
@@ -711,9 +712,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
@@ -741,27 +742,18 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.5-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 	ghostscript \
 	libaio1 \
 	libaspell15 \
+	libc-ares2 \
 	libc-client2007e \
 	libenchant1c2a \
+	libevent-2.0-5 \
 	libfbclient2 \
 	libfreetype6 \
 	libicu52 \
@@ -776,6 +768,7 @@ RUN set -eux \
 	librabbitmq1 \
 	librdkafka1 \
 	librecode0 \
+	libssl1.0.0 \
 	libsybdb5 \
 	libtidy-0.99-0 \
 	libvpx1 \
@@ -793,7 +786,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 RUN set -eux \
 	# ---------- imagick ----------
@@ -970,8 +974,6 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^sockets$' \
 	&& php -m | grep -oiE '^spl$' \
 	&& php-fpm -m | grep -oiE '^spl$' \
-	&& php -m | grep -oiE '^swoole$' \
-	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \
 	&& php-fpm -m | grep -oiE '^sysvmsg$' \
 	&& php -m | grep -oiE '^sysvsem$' \
@@ -1004,6 +1006,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^yaml$' \
 	&& php -m | grep -oiE '^zip$' \
 	&& php-fpm -m | grep -oiE '^zip$' \
+	&& php -m | grep -oiE '^swoole$' \
+	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& true
 
 

Dockerfiles/mods/Dockerfile-5.6

@@ -6,15 +6,15 @@ FROM devilbox/php-fpm:5.6-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		alien \
 		firebird-dev \
 		freetds-dev \
 		ghostscript \
 		libaio-dev \
 		libbz2-dev \
+		libc-ares-dev \
 		libc-client-dev \
 		libcurl4-openssl-dev \
 		libenchant-dev \
@@ -74,7 +74,8 @@ RUN set -eux \
 		patch \
 		pkg-config \
 		re2c \
-		xz-utils
+		xz-utils \
+	&& rm -rf /var/lib/apt/lists/*
 
 
 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -97,7 +98,7 @@ RUN set -eux \
 	# Type:         Custom extension
 	&& EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \
 && if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \
-&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \
+&& curl -sS --fail -k https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \
 && tar xvfz ioncube.tar.gz \
 && cd ioncube \
 && cp "ioncube_loader_lin_5.6.so" "${EXTENSION_DIR}/ioncube.so" \
@@ -400,9 +401,9 @@ RUN set -eux \
 && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \
 \
 && rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 && alien \
   -v \
@@ -592,17 +593,6 @@ RUN set -eux \
 	&& true
 
 
-# -------------------- Installing PHP Extension: swoole --------------------
-RUN set -eux \
-	# Installation: Version specific
-	# Type:         PECL extension
-	# Default:      Pecl command
-	&& pecl install swoole-1.9.23 \
-	# Enabling
-	&& docker-php-ext-enable swoole \
-	&& true
-
-
 # -------------------- Installing PHP Extension: sysvmsg --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -718,6 +708,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: swoole --------------------
+RUN set -eux \
+	# Installation: Version specific
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install swoole-1.9.23 \
+	# Enabling
+	&& docker-php-ext-enable swoole \
+	&& true
+
+
 
 
 # Fix php.ini settings for enabled extensions
@@ -730,9 +731,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
@@ -760,27 +761,18 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.6-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 	ghostscript \
 	libaio1 \
 	libaspell15 \
+	libc-ares2 \
 	libc-client2007e \
 	libenchant1c2a \
+	libevent-2.0-5 \
 	libfbclient2 \
 	libfreetype6 \
 	libicu57 \
@@ -812,7 +804,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 RUN set -eux \
 	# ---------- imagick ----------
@@ -989,8 +992,6 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^sockets$' \
 	&& php -m | grep -oiE '^spl$' \
 	&& php-fpm -m | grep -oiE '^spl$' \
-	&& php -m | grep -oiE '^swoole$' \
-	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \
 	&& php-fpm -m | grep -oiE '^sysvmsg$' \
 	&& php -m | grep -oiE '^sysvsem$' \
@@ -1023,6 +1024,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^yaml$' \
 	&& php -m | grep -oiE '^zip$' \
 	&& php-fpm -m | grep -oiE '^zip$' \
+	&& php -m | grep -oiE '^swoole$' \
+	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& true
 
 

Dockerfiles/mods/Dockerfile-7.0

@@ -6,37 +6,27 @@ FROM devilbox/php-fpm:7.0-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		alien \
-		fftw-dev \
 		firebird-dev \
 		freetds-dev \
 		ghostscript \
-		gobject-introspection \
-		gtk-doc-tools \
 		libaio-dev \
 		libbz2-dev \
+		libc-ares-dev \
 		libc-client-dev \
 		libcurl4-openssl-dev \
 		libenchant-dev \
 		libevent-dev \
-		libexif-dev \
-		libexpat1-dev \
 		libfbclient2 \
-		libfftw3-dev \
 		libfreetype6-dev \
-		libgif-dev \
-		libglib2.0-dev \
 		libgmp-dev \
 		libib-util \
 		libicu-dev \
 		libjpeg-dev \
 		libkrb5-dev \
 		libldap2-dev \
-		libmagick++-dev \
-		libmagickcore-6.q16-dev \
 		libmagickwand-dev \
 		libmariadbclient-dev \
 		libmcrypt-dev \
@@ -44,23 +34,20 @@ RUN set -eux \
 		libnghttp2-dev \
 		libpcre3-dev \
 		libpng-dev \
-		libpoppler-glib-dev \
 		libpq-dev \
 		libpspell-dev \
 		librabbitmq-dev \
 		librdkafka-dev \
 		librecode-dev \
-		librsvg2-dev \
 		libsasl2-dev \
 		libsnmp-dev \
 		libssh2-1-dev \
 		libssl-dev \
 		libtidy-dev \
-		libtool \
+		libvips-dev \
+		libvips42 \
 		libvpx-dev \
 		libwebp-dev \
-		libwebpdemux2 \
-		libwebpmux2 \
 		libxml2-dev \
 		libxpm-dev \
 		libxslt-dev \
@@ -91,7 +78,8 @@ RUN set -eux \
 		patch \
 		pkg-config \
 		re2c \
-		xz-utils
+		xz-utils \
+	&& rm -rf /var/lib/apt/lists/*
 
 
 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -114,7 +102,7 @@ RUN set -eux \
 	# Type:         Custom extension
 	&& EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \
 && if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \
-&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \
+&& curl -sS --fail -k https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \
 && tar xvfz ioncube.tar.gz \
 && cd ioncube \
 && cp "ioncube_loader_lin_7.0.so" "${EXTENSION_DIR}/ioncube.so" \
@@ -347,10 +335,10 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: memcached --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
-	# Default:      Pecl command
-	&& pecl install memcached \
+	# Custom:       Pecl command
+	&& printf "\n\n\nyes\nyes\nyes\n" | pecl install memcached \
 	# Enabling
 	&& docker-php-ext-enable memcached \
 	&& true
@@ -395,9 +383,9 @@ RUN set -eux \
 && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \
 \
 && rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 && alien \
   -v \
@@ -479,9 +467,9 @@ RUN set -eux \
 && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \
 \
 && rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 && alien \
   -v \
@@ -669,17 +657,6 @@ RUN set -eux \
 	&& true
 
 
-# -------------------- Installing PHP Extension: swoole --------------------
-RUN set -eux \
-	# Installation: Version specific
-	# Type:         PECL extension
-	# Default:      Pecl command
-	&& pecl install swoole-4.2.13 \
-	# Enabling
-	&& docker-php-ext-enable swoole \
-	&& true
-
-
 # -------------------- Installing PHP Extension: sysvmsg --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -737,15 +714,6 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: vips --------------------
 RUN set -eux \
-	# Generic pre-command
-	&& git clone https://github.com/libvips/libvips /tmp/libvips \
-&& cd /tmp/libvips \
-&& ./autogen.sh \
-&& make -j$(getconf _NPROCESSORS_ONLN) \
-&& make install \
-&& cd /tmp \
-&& rm -rf /tmp/libvips \
- \
 	# Installation: Generic
 	# Type:         PECL extension
 	# Default:      Pecl command
@@ -826,6 +794,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: swoole --------------------
+RUN set -eux \
+	# Installation: Version specific
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install swoole-4.2.13 \
+	# Enabling
+	&& docker-php-ext-enable swoole \
+	&& true
+
+
 
 
 # Fix php.ini settings for enabled extensions
@@ -838,9 +817,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
@@ -868,63 +847,38 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.0-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
-	fftw2 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 	ghostscript \
-	gir1.2-poppler-0.18 \
-	imagemagick-6.q16 \
 	libaio1 \
 	libaspell15 \
+	libc-ares2 \
 	libc-client2007e \
 	libenchant1c2a \
-	libexif12 \
-	libexpat1 \
+	libevent-2.0-5 \
 	libfbclient2 \
-	libfftw3-3 \
 	libfreetype6 \
-	libgif7 \
-	libglib2.0-0 \
 	libicu57 \
 	libjpeg62-turbo \
-	libmagick++-6.q16-7 \
-	libmagick++-6.q16hdri-7 \
-	libmagickcore-6.q16-3 \
-	libmagickcore-6.q16-3-extra \
 	libmagickwand-6.q16-3 \
-	libmagickwand-6.q16hdri-3 \
 	libmariadbclient18 \
 	libmcrypt4 \
 	libmemcachedutil2 \
 	libnghttp2-14 \
 	libpng16-16 \
-	libpoppler-glib8 \
 	libpq5 \
 	librabbitmq4 \
 	librdkafka1 \
 	librecode0 \
-	librsvg2-2 \
 	libssh2-1 \
 	libsybdb5 \
 	libtidy5 \
+	libvips42 \
 	libvpx4 \
 	libwebp6 \
-	libwebpdemux2 \
-	libwebpmux2 \
 	libxpm4 \
 	libxslt1.1 \
 	libyaml-0-2 \
@@ -939,7 +893,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 RUN set -eux \
 	# ---------- imagick ----------
@@ -1118,8 +1083,6 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^sqlsrv$' \
 	&& php -m | grep -oiE '^ssh2$' \
 	&& php-fpm -m | grep -oiE '^ssh2$' \
-	&& php -m | grep -oiE '^swoole$' \
-	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \
 	&& php-fpm -m | grep -oiE '^sysvmsg$' \
 	&& php -m | grep -oiE '^sysvsem$' \
@@ -1156,6 +1119,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^yaml$' \
 	&& php -m | grep -oiE '^zip$' \
 	&& php-fpm -m | grep -oiE '^zip$' \
+	&& php -m | grep -oiE '^swoole$' \
+	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& true
 
 

Dockerfiles/mods/Dockerfile-7.1

@@ -6,38 +6,27 @@ FROM devilbox/php-fpm:7.1-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		alien \
-		fftw-dev \
 		firebird-dev \
 		freetds-dev \
 		ghostscript \
-		gobject-introspection \
-		gtk-doc-tools \
 		libaio-dev \
 		libbz2-dev \
+		libc-ares-dev \
 		libc-client-dev \
 		libcurl4-openssl-dev \
 		libenchant-dev \
 		libevent-dev \
-		libexif-dev \
-		libexpat1-dev \
 		libfbclient2 \
-		libfftw3-dev \
 		libfreetype6-dev \
-		libgif-dev \
-		libglib2.0-dev \
 		libgmp-dev \
 		libib-util \
 		libicu-dev \
-		libimagequant-dev \
 		libjpeg-dev \
 		libkrb5-dev \
 		libldap2-dev \
-		libmagick++-dev \
-		libmagickcore-6.q16-dev \
 		libmagickwand-dev \
 		libmariadb-dev \
 		libmcrypt-dev \
@@ -45,23 +34,20 @@ RUN set -eux \
 		libnghttp2-dev \
 		libpcre3-dev \
 		libpng-dev \
-		libpoppler-glib-dev \
 		libpq-dev \
 		libpspell-dev \
 		librabbitmq-dev \
 		librdkafka-dev \
 		librecode-dev \
-		librsvg2-dev \
 		libsasl2-dev \
 		libsnmp-dev \
 		libssh2-1-dev \
 		libssl-dev \
 		libtidy-dev \
-		libtool \
+		libvips-dev \
+		libvips42 \
 		libvpx-dev \
 		libwebp-dev \
-		libwebpdemux2 \
-		libwebpmux3 \
 		libxml2-dev \
 		libxpm-dev \
 		libxslt-dev \
@@ -92,7 +78,8 @@ RUN set -eux \
 		patch \
 		pkg-config \
 		re2c \
-		xz-utils
+		xz-utils \
+	&& rm -rf /var/lib/apt/lists/*
 
 
 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -115,7 +102,7 @@ RUN set -eux \
 	# Type:         Custom extension
 	&& EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \
 && if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \
-&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \
+&& curl -sS --fail -k https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \
 && tar xvfz ioncube.tar.gz \
 && cd ioncube \
 && cp "ioncube_loader_lin_7.1.so" "${EXTENSION_DIR}/ioncube.so" \
@@ -348,10 +335,10 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: memcached --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
-	# Default:      Pecl command
-	&& pecl install memcached \
+	# Custom:       Pecl command
+	&& printf "\n\n\nyes\nyes\nyes\n" | pecl install memcached \
 	# Enabling
 	&& docker-php-ext-enable memcached \
 	&& true
@@ -395,9 +382,9 @@ RUN set -eux \
 && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \
 \
 && rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 && alien \
   -v \
@@ -478,9 +465,9 @@ RUN set -eux \
 && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \
 \
 && rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 && alien \
   -v \
@@ -679,17 +666,6 @@ RUN set -eux \
 	&& true
 
 
-# -------------------- Installing PHP Extension: swoole --------------------
-RUN set -eux \
-	# Installation: Version specific
-	# Type:         PECL extension
-	# Default:      Pecl command
-	&& pecl install swoole-4.4.26 \
-	# Enabling
-	&& docker-php-ext-enable swoole \
-	&& true
-
-
 # -------------------- Installing PHP Extension: sysvmsg --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -746,15 +722,6 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: vips --------------------
 RUN set -eux \
-	# Generic pre-command
-	&& git clone https://github.com/libvips/libvips /tmp/libvips \
-&& cd /tmp/libvips \
-&& ./autogen.sh \
-&& make -j$(getconf _NPROCESSORS_ONLN) \
-&& make install \
-&& cd /tmp \
-&& rm -rf /tmp/libvips \
- \
 	# Installation: Generic
 	# Type:         PECL extension
 	# Default:      Pecl command
@@ -835,6 +802,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: swoole --------------------
+RUN set -eux \
+	# Installation: Version specific
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install swoole-4.4.26 \
+	# Enabling
+	&& docker-php-ext-enable swoole \
+	&& true
+
+
 
 
 # Fix php.ini settings for enabled extensions
@@ -847,9 +825,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
@@ -877,64 +855,38 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.1-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
-	fftw2 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 	ghostscript \
-	gir1.2-poppler-0.18 \
-	imagemagick-6.q16 \
 	libaio1 \
 	libaspell15 \
+	libc-ares2 \
 	libc-client2007e \
 	libenchant1c2a \
-	libexif12 \
-	libexpat1 \
+	libevent-2.1-6 \
 	libfbclient2 \
-	libfftw3-3 \
 	libfreetype6 \
-	libgif7 \
-	libglib2.0-0 \
 	libicu63 \
-	libimagequant0 \
 	libjpeg62-turbo \
-	libmagick++-6.q16-8 \
-	libmagick++-6.q16hdri-8 \
-	libmagickcore-6.q16-6 \
-	libmagickcore-6.q16-6-extra \
 	libmagickwand-6.q16-6 \
-	libmagickwand-6.q16hdri-6 \
 	libmariadbd19 \
 	libmcrypt4 \
 	libmemcachedutil2 \
 	libnghttp2-14 \
 	libpng16-16 \
-	libpoppler-glib8 \
 	libpq5 \
 	librabbitmq4 \
 	librdkafka1 \
 	librecode0 \
-	librsvg2-2 \
 	libssh2-1 \
 	libsybdb5 \
 	libtidy5deb1 \
+	libvips42 \
 	libvpx5 \
 	libwebp6 \
-	libwebpdemux2 \
-	libwebpmux3 \
 	libxpm4 \
 	libxslt1.1 \
 	libyaml-0-2 \
@@ -949,7 +901,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 RUN set -eux \
 	# ---------- imagick ----------
@@ -1130,8 +1093,6 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^sqlsrv$' \
 	&& php -m | grep -oiE '^ssh2$' \
 	&& php-fpm -m | grep -oiE '^ssh2$' \
-	&& php -m | grep -oiE '^swoole$' \
-	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \
 	&& php-fpm -m | grep -oiE '^sysvmsg$' \
 	&& php -m | grep -oiE '^sysvsem$' \
@@ -1168,6 +1129,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^yaml$' \
 	&& php -m | grep -oiE '^zip$' \
 	&& php-fpm -m | grep -oiE '^zip$' \
+	&& php -m | grep -oiE '^swoole$' \
+	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& true
 
 

Dockerfiles/mods/Dockerfile-7.2

@@ -6,38 +6,27 @@ FROM devilbox/php-fpm:7.2-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		alien \
-		fftw-dev \
 		firebird-dev \
 		freetds-dev \
 		ghostscript \
-		gobject-introspection \
-		gtk-doc-tools \
 		libaio-dev \
 		libbz2-dev \
+		libc-ares-dev \
 		libc-client-dev \
 		libcurl4-openssl-dev \
 		libenchant-dev \
 		libevent-dev \
-		libexif-dev \
-		libexpat1-dev \
 		libfbclient2 \
-		libfftw3-dev \
 		libfreetype6-dev \
-		libgif-dev \
-		libglib2.0-dev \
 		libgmp-dev \
 		libib-util \
 		libicu-dev \
-		libimagequant-dev \
 		libjpeg-dev \
 		libkrb5-dev \
 		libldap2-dev \
-		libmagick++-dev \
-		libmagickcore-6.q16-dev \
 		libmagickwand-dev \
 		libmariadb-dev \
 		libmcrypt-dev \
@@ -45,23 +34,20 @@ RUN set -eux \
 		libnghttp2-dev \
 		libpcre3-dev \
 		libpng-dev \
-		libpoppler-glib-dev \
 		libpq-dev \
 		libpspell-dev \
 		librabbitmq-dev \
 		librdkafka-dev \
 		librecode-dev \
-		librsvg2-dev \
 		libsasl2-dev \
 		libsnmp-dev \
 		libssh2-1-dev \
 		libssl-dev \
 		libtidy-dev \
-		libtool \
+		libvips-dev \
+		libvips42 \
 		libvpx-dev \
 		libwebp-dev \
-		libwebpdemux2 \
-		libwebpmux3 \
 		libxml2-dev \
 		libxpm-dev \
 		libxslt-dev \
@@ -92,7 +78,8 @@ RUN set -eux \
 		patch \
 		pkg-config \
 		re2c \
-		xz-utils
+		xz-utils \
+	&& rm -rf /var/lib/apt/lists/*
 
 
 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -115,7 +102,7 @@ RUN set -eux \
 	# Type:         Custom extension
 	&& EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \
 && if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \
-&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \
+&& curl -sS --fail -k https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \
 && tar xvfz ioncube.tar.gz \
 && cd ioncube \
 && cp "ioncube_loader_lin_7.2.so" "${EXTENSION_DIR}/ioncube.so" \
@@ -350,10 +337,10 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: memcached --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
-	# Default:      Pecl command
-	&& pecl install memcached \
+	# Custom:       Pecl command
+	&& printf "\n\n\nyes\nyes\nyes\n" | pecl install memcached \
 	# Enabling
 	&& docker-php-ext-enable memcached \
 	&& true
@@ -397,9 +384,9 @@ RUN set -eux \
 && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \
 \
 && rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 && alien \
   -v \
@@ -480,9 +467,9 @@ RUN set -eux \
 && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \
 \
 && rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 && alien \
   -v \
@@ -547,12 +534,12 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: phalcon --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         GIT extension
 	&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
 	&& cd /tmp/phalcon \
 	# Custom:       Branch
-	&& git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | sed 's/^.*tags\///g' | grep -E '^v[.0-9]+$' | tail -1) \
+	&& git checkout v4.1.1 \
 	# Custom:       Install command
 	&& cd build && ./install \
 	# Enabling
@@ -682,17 +669,6 @@ RUN set -eux \
 	&& true
 
 
-# -------------------- Installing PHP Extension: swoole --------------------
-RUN set -eux \
-	# Installation: Generic
-	# Type:         PECL extension
-	# Custom:       Pecl command
-	&& yes yes | pecl install swoole \
-	# Enabling
-	&& docker-php-ext-enable swoole \
-	&& true
-
-
 # -------------------- Installing PHP Extension: sysvmsg --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -749,15 +725,6 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: vips --------------------
 RUN set -eux \
-	# Generic pre-command
-	&& git clone https://github.com/libvips/libvips /tmp/libvips \
-&& cd /tmp/libvips \
-&& ./autogen.sh \
-&& make -j$(getconf _NPROCESSORS_ONLN) \
-&& make install \
-&& cd /tmp \
-&& rm -rf /tmp/libvips \
- \
 	# Installation: Generic
 	# Type:         PECL extension
 	# Default:      Pecl command
@@ -838,6 +805,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: swoole --------------------
+RUN set -eux \
+	# Installation: Version specific
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install swoole-4.8.12 \
+	# Enabling
+	&& docker-php-ext-enable swoole \
+	&& true
+
+
 
 
 # Fix php.ini settings for enabled extensions
@@ -850,9 +828,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
@@ -880,64 +858,38 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.2-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
-	fftw2 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 	ghostscript \
-	gir1.2-poppler-0.18 \
-	imagemagick-6.q16 \
 	libaio1 \
 	libaspell15 \
+	libc-ares2 \
 	libc-client2007e \
 	libenchant1c2a \
-	libexif12 \
-	libexpat1 \
+	libevent-2.1-6 \
 	libfbclient2 \
-	libfftw3-3 \
 	libfreetype6 \
-	libgif7 \
-	libglib2.0-0 \
 	libicu63 \
-	libimagequant0 \
 	libjpeg62-turbo \
-	libmagick++-6.q16-8 \
-	libmagick++-6.q16hdri-8 \
-	libmagickcore-6.q16-6 \
-	libmagickcore-6.q16-6-extra \
 	libmagickwand-6.q16-6 \
-	libmagickwand-6.q16hdri-6 \
 	libmariadbd19 \
 	libmcrypt4 \
 	libmemcachedutil2 \
 	libnghttp2-14 \
 	libpng16-16 \
-	libpoppler-glib8 \
 	libpq5 \
 	librabbitmq4 \
 	librdkafka1 \
 	librecode0 \
-	librsvg2-2 \
 	libssh2-1 \
 	libsybdb5 \
 	libtidy5deb1 \
+	libvips42 \
 	libvpx5 \
 	libwebp6 \
-	libwebpdemux2 \
-	libwebpmux3 \
 	libxpm4 \
 	libxslt1.1 \
 	libyaml-0-2 \
@@ -952,7 +904,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 RUN set -eux \
 	# ---------- imagick ----------
@@ -1135,8 +1098,6 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^sqlsrv$' \
 	&& php -m | grep -oiE '^ssh2$' \
 	&& php-fpm -m | grep -oiE '^ssh2$' \
-	&& php -m | grep -oiE '^swoole$' \
-	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \
 	&& php-fpm -m | grep -oiE '^sysvmsg$' \
 	&& php -m | grep -oiE '^sysvsem$' \
@@ -1173,6 +1134,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^yaml$' \
 	&& php -m | grep -oiE '^zip$' \
 	&& php-fpm -m | grep -oiE '^zip$' \
+	&& php -m | grep -oiE '^swoole$' \
+	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& true
 
 

Dockerfiles/mods/Dockerfile-7.3

@@ -6,37 +6,26 @@ FROM devilbox/php-fpm:7.3-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		alien \
-		fftw-dev \
 		firebird-dev \
 		freetds-dev \
 		ghostscript \
-		gobject-introspection \
-		gtk-doc-tools \
 		libaio-dev \
 		libbz2-dev \
+		libc-ares-dev \
 		libc-client-dev \
 		libcurl4-openssl-dev \
 		libevent-dev \
-		libexif-dev \
-		libexpat1-dev \
 		libfbclient2 \
-		libfftw3-dev \
 		libfreetype6-dev \
-		libgif-dev \
-		libglib2.0-dev \
 		libgmp-dev \
 		libib-util \
 		libicu-dev \
-		libimagequant-dev \
 		libjpeg-dev \
 		libkrb5-dev \
 		libldap2-dev \
-		libmagick++-dev \
-		libmagickcore-6.q16-dev \
 		libmagickwand-dev \
 		libmariadb-dev \
 		libmcrypt-dev \
@@ -44,23 +33,20 @@ RUN set -eux \
 		libnghttp2-dev \
 		libpcre3-dev \
 		libpng-dev \
-		libpoppler-glib-dev \
 		libpq-dev \
 		libpspell-dev \
 		librabbitmq-dev \
 		librdkafka-dev \
 		librecode-dev \
-		librsvg2-dev \
 		libsasl2-dev \
 		libsnmp-dev \
 		libssh2-1-dev \
 		libssl-dev \
 		libtidy-dev \
-		libtool \
+		libvips-dev \
+		libvips42 \
 		libvpx-dev \
 		libwebp-dev \
-		libwebpdemux2 \
-		libwebpmux3 \
 		libxml2-dev \
 		libxpm-dev \
 		libxslt-dev \
@@ -91,7 +77,8 @@ RUN set -eux \
 		patch \
 		pkg-config \
 		re2c \
-		xz-utils
+		xz-utils \
+	&& rm -rf /var/lib/apt/lists/*
 
 
 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -114,7 +101,7 @@ RUN set -eux \
 	# Type:         Custom extension
 	&& EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \
 && if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \
-&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \
+&& curl -sS --fail -k https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \
 && tar xvfz ioncube.tar.gz \
 && cd ioncube \
 && cp "ioncube_loader_lin_7.3.so" "${EXTENSION_DIR}/ioncube.so" \
@@ -342,8 +329,8 @@ RUN set -eux \
 RUN set -eux \
 	# Installation: Generic
 	# Type:         PECL extension
-	# Default:      Pecl command
-	&& pecl install memcached \
+	# Custom:       Pecl command
+	&& printf "\n\n\nyes\nyes\nyes\n" | pecl install memcached \
 	# Enabling
 	&& docker-php-ext-enable memcached \
 	&& true
@@ -387,9 +374,9 @@ RUN set -eux \
 && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \
 \
 && rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 && alien \
   -v \
@@ -470,9 +457,9 @@ RUN set -eux \
 && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \
 \
 && rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 && alien \
   -v \
@@ -537,12 +524,12 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: phalcon --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         GIT extension
 	&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
 	&& cd /tmp/phalcon \
 	# Custom:       Branch
-	&& git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | sed 's/^.*tags\///g' | grep -E '^v[.0-9]+$' | tail -1) \
+	&& git checkout v4.1.2 \
 	# Custom:       Install command
 	&& cd build && ./install \
 	# Enabling
@@ -672,17 +659,6 @@ RUN set -eux \
 	&& true
 
 
-# -------------------- Installing PHP Extension: swoole --------------------
-RUN set -eux \
-	# Installation: Generic
-	# Type:         PECL extension
-	# Custom:       Pecl command
-	&& yes yes | pecl install swoole \
-	# Enabling
-	&& docker-php-ext-enable swoole \
-	&& true
-
-
 # -------------------- Installing PHP Extension: sysvmsg --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -739,15 +715,6 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: vips --------------------
 RUN set -eux \
-	# Generic pre-command
-	&& git clone https://github.com/libvips/libvips /tmp/libvips \
-&& cd /tmp/libvips \
-&& ./autogen.sh \
-&& make -j$(getconf _NPROCESSORS_ONLN) \
-&& make install \
-&& cd /tmp \
-&& rm -rf /tmp/libvips \
- \
 	# Installation: Generic
 	# Type:         PECL extension
 	# Default:      Pecl command
@@ -828,6 +795,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: swoole --------------------
+RUN set -eux \
+	# Installation: Version specific
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install swoole-4.8.12 \
+	# Enabling
+	&& docker-php-ext-enable swoole \
+	&& true
+
+
 
 
 # Fix php.ini settings for enabled extensions
@@ -840,9 +818,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
@@ -870,63 +848,37 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.3-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
-	fftw2 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 	ghostscript \
-	gir1.2-poppler-0.18 \
-	imagemagick-6.q16 \
 	libaio1 \
 	libaspell15 \
+	libc-ares2 \
 	libc-client2007e \
-	libexif12 \
-	libexpat1 \
+	libevent-2.1-7 \
 	libfbclient2 \
-	libfftw3-3 \
 	libfreetype6 \
-	libgif7 \
-	libglib2.0-0 \
 	libicu67 \
-	libimagequant0 \
 	libjpeg62-turbo \
-	libmagick++-6.q16-8 \
-	libmagick++-6.q16hdri-8 \
-	libmagickcore-6.q16-6 \
-	libmagickcore-6.q16-6-extra \
 	libmagickwand-6.q16-6 \
-	libmagickwand-6.q16hdri-6 \
 	libmariadbd19 \
 	libmcrypt4 \
 	libmemcachedutil2 \
 	libnghttp2-14 \
 	libpng16-16 \
-	libpoppler-glib8 \
 	libpq5 \
 	librabbitmq4 \
 	librdkafka1 \
 	librecode0 \
-	librsvg2-2 \
 	libssh2-1 \
 	libsybdb5 \
 	libtidy5deb1 \
+	libvips42 \
 	libvpx6 \
 	libwebp6 \
-	libwebpdemux2 \
-	libwebpmux3 \
 	libxpm4 \
 	libxslt1.1 \
 	libyaml-0-2 \
@@ -941,7 +893,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 RUN set -eux \
 	# ---------- imagick ----------
@@ -1122,8 +1085,6 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^sqlsrv$' \
 	&& php -m | grep -oiE '^ssh2$' \
 	&& php-fpm -m | grep -oiE '^ssh2$' \
-	&& php -m | grep -oiE '^swoole$' \
-	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \
 	&& php-fpm -m | grep -oiE '^sysvmsg$' \
 	&& php -m | grep -oiE '^sysvsem$' \
@@ -1160,6 +1121,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^yaml$' \
 	&& php -m | grep -oiE '^zip$' \
 	&& php-fpm -m | grep -oiE '^zip$' \
+	&& php -m | grep -oiE '^swoole$' \
+	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& true
 
 

Dockerfiles/mods/Dockerfile-7.4

@@ -6,38 +6,27 @@ FROM devilbox/php-fpm:7.4-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		alien \
-		fftw-dev \
 		firebird-dev \
 		freetds-dev \
 		ghostscript \
-		gobject-introspection \
-		gtk-doc-tools \
 		libaio-dev \
 		libbz2-dev \
+		libc-ares-dev \
 		libc-client-dev \
 		libcurl4-openssl-dev \
 		libevent-dev \
-		libexif-dev \
-		libexpat1-dev \
 		libfbclient2 \
 		libffi-dev \
-		libfftw3-dev \
 		libfreetype6-dev \
-		libgif-dev \
-		libglib2.0-dev \
 		libgmp-dev \
 		libib-util \
 		libicu-dev \
-		libimagequant-dev \
 		libjpeg-dev \
 		libkrb5-dev \
 		libldap2-dev \
-		libmagick++-dev \
-		libmagickcore-6.q16-dev \
 		libmagickwand-dev \
 		libmariadb-dev \
 		libmcrypt-dev \
@@ -45,22 +34,19 @@ RUN set -eux \
 		libnghttp2-dev \
 		libpcre3-dev \
 		libpng-dev \
-		libpoppler-glib-dev \
 		libpq-dev \
 		libpspell-dev \
 		librabbitmq-dev \
 		librdkafka-dev \
-		librsvg2-dev \
 		libsasl2-dev \
 		libsnmp-dev \
 		libssh2-1-dev \
 		libssl-dev \
 		libtidy-dev \
-		libtool \
+		libvips-dev \
+		libvips42 \
 		libvpx-dev \
 		libwebp-dev \
-		libwebpdemux2 \
-		libwebpmux3 \
 		libxml2-dev \
 		libxpm-dev \
 		libxslt-dev \
@@ -91,7 +77,8 @@ RUN set -eux \
 		patch \
 		pkg-config \
 		re2c \
-		xz-utils
+		xz-utils \
+	&& rm -rf /var/lib/apt/lists/*
 
 
 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -114,7 +101,7 @@ RUN set -eux \
 	# Type:         Custom extension
 	&& EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \
 && if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \
-&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \
+&& curl -sS --fail -k https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \
 && tar xvfz ioncube.tar.gz \
 && cd ioncube \
 && cp "ioncube_loader_lin_7.4.so" "${EXTENSION_DIR}/ioncube.so" \
@@ -340,14 +327,10 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: memcached --------------------
 RUN set -eux \
-	# Installation: Version specific
-	# Type:         GIT extension
-	&& git clone https://github.com/php-memcached-dev/php-memcached /tmp/memcached \
-	&& cd /tmp/memcached \
-	# Custom:       Branch
-	&& git checkout master \
-	# Custom:       Install command
-	&& phpize && ./configure --enable-memcached && make -j$(getconf _NPROCESSORS_ONLN) && make install \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Custom:       Pecl command
+	&& printf "\n\n\nyes\nyes\nyes\n" | pecl install memcached \
 	# Enabling
 	&& docker-php-ext-enable memcached \
 	&& true
@@ -391,9 +374,9 @@ RUN set -eux \
 && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \
 \
 && rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 && alien \
   -v \
@@ -474,9 +457,9 @@ RUN set -eux \
 && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \
 \
 && rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 && alien \
   -v \
@@ -670,17 +653,6 @@ RUN set -eux \
 	&& true
 
 
-# -------------------- Installing PHP Extension: swoole --------------------
-RUN set -eux \
-	# Installation: Generic
-	# Type:         PECL extension
-	# Custom:       Pecl command
-	&& yes yes | pecl install swoole \
-	# Enabling
-	&& docker-php-ext-enable swoole \
-	&& true
-
-
 # -------------------- Installing PHP Extension: sysvmsg --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -737,15 +709,6 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: vips --------------------
 RUN set -eux \
-	# Generic pre-command
-	&& git clone https://github.com/libvips/libvips /tmp/libvips \
-&& cd /tmp/libvips \
-&& ./autogen.sh \
-&& make -j$(getconf _NPROCESSORS_ONLN) \
-&& make install \
-&& cd /tmp \
-&& rm -rf /tmp/libvips \
- \
 	# Installation: Generic
 	# Type:         PECL extension
 	# Default:      Pecl command
@@ -818,6 +781,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: swoole --------------------
+RUN set -eux \
+	# Installation: Version specific
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install swoole-4.8.12 \
+	# Enabling
+	&& docker-php-ext-enable swoole \
+	&& true
+
+
 
 
 # Fix php.ini settings for enabled extensions
@@ -830,9 +804,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
@@ -860,63 +834,37 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.4-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
-	fftw2 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 	ghostscript \
-	gir1.2-poppler-0.18 \
-	imagemagick-6.q16 \
 	libaio1 \
 	libaspell15 \
+	libc-ares2 \
 	libc-client2007e \
-	libexif12 \
-	libexpat1 \
+	libevent-2.1-7 \
 	libfbclient2 \
 	libffi7 \
-	libfftw3-3 \
 	libfreetype6 \
-	libgif7 \
-	libglib2.0-0 \
 	libicu67 \
-	libimagequant0 \
 	libjpeg62-turbo \
-	libmagick++-6.q16-8 \
-	libmagick++-6.q16hdri-8 \
-	libmagickcore-6.q16-6 \
-	libmagickcore-6.q16-6-extra \
 	libmagickwand-6.q16-6 \
-	libmagickwand-6.q16hdri-6 \
 	libmariadbd19 \
 	libmcrypt4 \
 	libmemcachedutil2 \
 	libnghttp2-14 \
 	libpng16-16 \
-	libpoppler-glib8 \
 	libpq5 \
 	librabbitmq4 \
 	librdkafka1 \
-	librsvg2-2 \
 	libssh2-1 \
 	libsybdb5 \
 	libtidy5deb1 \
+	libvips42 \
 	libvpx6 \
 	libwebp6 \
-	libwebpdemux2 \
-	libwebpmux3 \
 	libxpm4 \
 	libxslt1.1 \
 	libyaml-0-2 \
@@ -931,7 +879,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 RUN set -eux \
 	# ---------- imagick ----------
@@ -1110,8 +1069,6 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^sqlsrv$' \
 	&& php -m | grep -oiE '^ssh2$' \
 	&& php-fpm -m | grep -oiE '^ssh2$' \
-	&& php -m | grep -oiE '^swoole$' \
-	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \
 	&& php-fpm -m | grep -oiE '^sysvmsg$' \
 	&& php -m | grep -oiE '^sysvsem$' \
@@ -1146,6 +1103,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^yaml$' \
 	&& php -m | grep -oiE '^zip$' \
 	&& php-fpm -m | grep -oiE '^zip$' \
+	&& php -m | grep -oiE '^swoole$' \
+	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& true
 
 

Dockerfiles/mods/Dockerfile-8.0

@@ -6,15 +6,15 @@ FROM devilbox/php-fpm:8.0-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		alien \
 		firebird-dev \
 		freetds-dev \
 		ghostscript \
 		libaio-dev \
 		libbz2-dev \
+		libc-ares-dev \
 		libc-client-dev \
 		libcurl4-openssl-dev \
 		libenchant-2-dev \
@@ -43,6 +43,8 @@ RUN set -eux \
 		libsodium-dev \
 		libssl-dev \
 		libtidy-dev \
+		libvips-dev \
+		libvips42 \
 		libvpx-dev \
 		libwebp-dev \
 		libxml2-dev \
@@ -75,7 +77,8 @@ RUN set -eux \
 		patch \
 		pkg-config \
 		re2c \
-		xz-utils
+		xz-utils \
+	&& rm -rf /var/lib/apt/lists/*
 
 
 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -307,21 +310,10 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: memcached --------------------
 RUN set -eux \
-	# Installation: Version specific
-	# Type:         GIT extension
-	&& git clone https://github.com/php-memcached-dev/php-memcached /tmp/memcached \
-	&& cd /tmp/memcached \
-	# Custom:       Branch
-	&& git checkout master \
-	# Custom:       Install command
-	&& true \
-# FIXME: This is a work-around to mitigate compile error with PHP 8.0
-&& sed -i'' 's/\sTSRMLS_CC//g' php_memcached_session.c \
-&& phpize \
-&& ./configure --enable-memcached \
-&& make -j$(getconf _NPROCESSORS_ONLN) \
-&& make install \
- \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Custom:       Pecl command
+	&& printf "\n\n\nyes\nyes\nyes\n" | pecl install memcached \
 	# Enabling
 	&& docker-php-ext-enable memcached \
 	&& true
@@ -365,9 +357,9 @@ RUN set -eux \
 && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \
 \
 && rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 && alien \
   -v \
@@ -448,9 +440,9 @@ RUN set -eux \
 && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \
 \
 && rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 && alien \
   -v \
@@ -628,17 +620,6 @@ RUN set -eux \
 	&& true
 
 
-# -------------------- Installing PHP Extension: swoole --------------------
-RUN set -eux \
-	# Installation: Generic
-	# Type:         PECL extension
-	# Custom:       Pecl command
-	&& yes yes | pecl install swoole \
-	# Enabling
-	&& docker-php-ext-enable swoole \
-	&& true
-
-
 # -------------------- Installing PHP Extension: sysvmsg --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -693,6 +674,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: vips --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install vips \
+	# Enabling
+	&& docker-php-ext-enable vips \
+	&& true
+
+
 # -------------------- Installing PHP Extension: xdebug --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -744,6 +736,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: swoole --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Custom:       Pecl command
+	&& pecl install -D 'enable-sockets="no" enable-openssl="yes" enable-http2="yes" enable-mysqlnd="yes" enable-swoole-json="no" enable-swoole-curl="yes" enable-cares="yes" with-postgres="yes"' swoole \
+	# Enabling
+	&& docker-php-ext-enable swoole \
+	&& true
+
+
 
 
 # Fix php.ini settings for enabled extensions
@@ -756,9 +759,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
@@ -786,27 +789,18 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 8.0-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 	ghostscript \
 	libaio1 \
 	libaspell15 \
+	libc-ares2 \
 	libc-client2007e \
 	libenchant-2-2 \
+	libevent-2.1-7 \
 	libfbclient2 \
 	libffi7 \
 	libfreetype6 \
@@ -823,6 +817,7 @@ RUN set -eux \
 	librdkafka1 \
 	libsybdb5 \
 	libtidy5deb1 \
+	libvips42 \
 	libvpx6 \
 	libwebp6 \
 	libxpm4 \
@@ -839,7 +834,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 RUN set -eux \
 	# ---------- imagick ----------
@@ -1016,8 +1022,6 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^spl$' \
 	&& php -m | grep -oiE '^sqlsrv$' \
 	&& php-fpm -m | grep -oiE '^sqlsrv$' \
-	&& php -m | grep -oiE '^swoole$' \
-	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \
 	&& php-fpm -m | grep -oiE '^sysvmsg$' \
 	&& php -m | grep -oiE '^sysvsem$' \
@@ -1032,6 +1036,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^uploadprogress$' \
 	&& php -m | grep -oiE '^uuid$' \
 	&& php-fpm -m | grep -oiE '^uuid$' \
+	&& php -m | grep -oiE '^vips$' \
+	&& php-fpm -m | grep -oiE '^vips$' \
 	&& php -m | grep -oiE '^xdebug$' \
 	&& php-fpm -m | grep -oiE '^xdebug$' \
 	&& php -m | grep -oiE '^xml$' \
@@ -1048,6 +1054,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^yaml$' \
 	&& php -m | grep -oiE '^zip$' \
 	&& php-fpm -m | grep -oiE '^zip$' \
+	&& php -m | grep -oiE '^swoole$' \
+	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& true
 
 

Dockerfiles/mods/Dockerfile-8.1

@@ -6,9 +6,8 @@ FROM devilbox/php-fpm:8.1-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		alien \
 		firebird-dev \
 		freetds-dev \
@@ -16,6 +15,7 @@ RUN set -eux \
 		libaio-dev \
 		libavif-dev \
 		libbz2-dev \
+		libc-ares-dev \
 		libc-client-dev \
 		libcurl4-openssl-dev \
 		libenchant-2-dev \
@@ -31,6 +31,7 @@ RUN set -eux \
 		libmagickwand-dev \
 		libmariadb-dev \
 		libmemcached-dev \
+		libnghttp2-dev \
 		libpcre3-dev \
 		libpng-dev \
 		libpq-dev \
@@ -42,6 +43,8 @@ RUN set -eux \
 		libsodium-dev \
 		libssl-dev \
 		libtidy-dev \
+		libvips-dev \
+		libvips42 \
 		libvpx-dev \
 		libwebp-dev \
 		libxml2-dev \
@@ -74,7 +77,8 @@ RUN set -eux \
 		patch \
 		pkg-config \
 		re2c \
-		xz-utils
+		xz-utils \
+	&& rm -rf /var/lib/apt/lists/*
 
 
 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -281,21 +285,10 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: memcached --------------------
 RUN set -eux \
-	# Installation: Version specific
-	# Type:         GIT extension
-	&& git clone https://github.com/php-memcached-dev/php-memcached /tmp/memcached \
-	&& cd /tmp/memcached \
-	# Custom:       Branch
-	&& git checkout master \
-	# Custom:       Install command
-	&& true \
-# FIXME: This is a work-around to mitigate compile error with PHP 8.1
-&& sed -i'' 's/\sTSRMLS_CC//g' php_memcached_session.c \
-&& phpize \
-&& ./configure --enable-memcached \
-&& make -j$(getconf _NPROCESSORS_ONLN) \
-&& make install \
- \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Custom:       Pecl command
+	&& printf "\n\n\nyes\nyes\nyes\n" | pecl install memcached \
 	# Enabling
 	&& docker-php-ext-enable memcached \
 	&& true
@@ -339,9 +332,9 @@ RUN set -eux \
 && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \
 \
 && rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 && alien \
   -v \
@@ -425,9 +418,9 @@ RUN set -eux \
 && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \
 \
 && rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 && alien \
   -v \
@@ -661,6 +654,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: vips --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install vips \
+	# Enabling
+	&& docker-php-ext-enable vips \
+	&& true
+
+
 # -------------------- Installing PHP Extension: xdebug --------------------
 RUN set -eux \
 	# Installation: Version specific
@@ -719,6 +723,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: swoole --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Custom:       Pecl command
+	&& pecl install -D 'enable-sockets="no" enable-openssl="yes" enable-http2="yes" enable-mysqlnd="yes" enable-swoole-json="no" enable-swoole-curl="yes" enable-cares="yes" with-postgres="yes"' swoole \
+	# Enabling
+	&& docker-php-ext-enable swoole \
+	&& true
+
+
 
 
 # Fix php.ini settings for enabled extensions
@@ -731,9 +746,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
@@ -761,28 +776,19 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 8.1-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 	ghostscript \
 	libaio1 \
 	libaspell15 \
 	libavif9 \
+	libc-ares2 \
 	libc-client2007e \
 	libenchant-2-2 \
+	libevent-2.1-7 \
 	libfbclient2 \
 	libffi7 \
 	libfreetype6 \
@@ -791,12 +797,14 @@ RUN set -eux \
 	libmagickwand-6.q16-6 \
 	libmariadbd19 \
 	libmemcachedutil2 \
+	libnghttp2-14 \
 	libpng16-16 \
 	libpq5 \
 	librabbitmq4 \
 	librdkafka1 \
 	libsybdb5 \
 	libtidy5deb1 \
+	libvips42 \
 	libvpx6 \
 	libwebp6 \
 	libxpm4 \
@@ -813,7 +821,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 RUN set -eux \
 	# ---------- imagick ----------
@@ -1002,6 +1021,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^uploadprogress$' \
 	&& php -m | grep -oiE '^uuid$' \
 	&& php-fpm -m | grep -oiE '^uuid$' \
+	&& php -m | grep -oiE '^vips$' \
+	&& php-fpm -m | grep -oiE '^vips$' \
 	&& php -m | grep -oiE '^xdebug$' \
 	&& php-fpm -m | grep -oiE '^xdebug$' \
 	&& php -m | grep -oiE '^xml$' \
@@ -1018,6 +1039,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^yaml$' \
 	&& php -m | grep -oiE '^zip$' \
 	&& php-fpm -m | grep -oiE '^zip$' \
+	&& php -m | grep -oiE '^swoole$' \
+	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& true
 
 

Dockerfiles/mods/Dockerfile-8.2

@@ -6,9 +6,8 @@ FROM devilbox/php-fpm:8.2-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		alien \
 		firebird-dev \
 		freetds-dev \
@@ -74,7 +73,8 @@ RUN set -eux \
 		patch \
 		pkg-config \
 		re2c \
-		xz-utils
+		xz-utils \
+	&& rm -rf /var/lib/apt/lists/*
 
 
 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -339,9 +339,9 @@ RUN set -eux \
 && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \
 \
 && rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 && alien \
   -v \
@@ -425,9 +425,9 @@ RUN set -eux \
 && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \
 \
 && rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
-&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+&& curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
 && alien \
   -v \
@@ -720,9 +720,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
@@ -750,28 +750,18 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 8.2-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 	ghostscript \
 	libaio1 \
 	libaspell15 \
 	libavif9 \
 	libc-client2007e \
 	libenchant-2-2 \
+	libevent-2.1-7 \
 	libfbclient2 \
 	libffi7 \
 	libfreetype6 \
@@ -802,7 +792,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 RUN set -eux \
 	# ---------- imagick ----------

Dockerfiles/prod/Dockerfile-5.2

@@ -26,9 +26,8 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.2-prod"
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,18 +35,21 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
+# Fix: rsyslogd: imklog: cannot open kernel log (/proc/kmsg): Operation not permitted.
+	&& sed -i''  's/.*imklog.*//g' /etc/rsyslog.conf \
+	\
+# Setup Supervisor
 	&& rm -rf /etc/supervisor* \
 	&& mkdir -p /var/log/supervisor \
 	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###

Dockerfiles/prod/Dockerfile-5.3

@@ -26,9 +26,8 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.3-prod"
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,18 +35,21 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
+# Fix: rsyslogd: imklog: cannot open kernel log (/proc/kmsg): Operation not permitted.
+	&& sed -i''  's/.*imklog.*//g' /etc/rsyslog.conf \
+	\
+# Setup Supervisor
 	&& rm -rf /etc/supervisor* \
 	&& mkdir -p /var/log/supervisor \
 	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###

Dockerfiles/prod/Dockerfile-5.4

@@ -26,9 +26,8 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.4-prod"
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,18 +35,21 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
+# Fix: rsyslogd: imklog: cannot open kernel log (/proc/kmsg): Operation not permitted.
+	&& sed -i''  's/.*imklog.*//g' /etc/rsyslog.conf \
+	\
+# Setup Supervisor
 	&& rm -rf /etc/supervisor* \
 	&& mkdir -p /var/log/supervisor \
 	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###

Dockerfiles/prod/Dockerfile-5.5

@@ -26,9 +26,8 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.5-prod"
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,18 +35,21 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
+# Fix: rsyslogd: imklog: cannot open kernel log (/proc/kmsg): Operation not permitted.
+	&& sed -i''  's/.*imklog.*//g' /etc/rsyslog.conf \
+	\
+# Setup Supervisor
 	&& rm -rf /etc/supervisor* \
 	&& mkdir -p /var/log/supervisor \
 	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###

Dockerfiles/prod/Dockerfile-5.6

@@ -26,9 +26,8 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.6-prod"
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,18 +35,21 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
+# Fix: rsyslogd: imklog: cannot open kernel log (/proc/kmsg): Operation not permitted.
+	&& sed -i''  's/.*imklog.*//g' /etc/rsyslog.conf \
+	\
+# Setup Supervisor
 	&& rm -rf /etc/supervisor* \
 	&& mkdir -p /var/log/supervisor \
 	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###

Dockerfiles/prod/Dockerfile-7.0

@@ -26,9 +26,8 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.0-prod"
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,18 +35,21 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
+# Fix: rsyslogd: imklog: cannot open kernel log (/proc/kmsg): Operation not permitted.
+	&& sed -i''  's/.*imklog.*//g' /etc/rsyslog.conf \
+	\
+# Setup Supervisor
 	&& rm -rf /etc/supervisor* \
 	&& mkdir -p /var/log/supervisor \
 	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###

Dockerfiles/prod/Dockerfile-7.1

@@ -26,9 +26,8 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.1-prod"
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,18 +35,21 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
+# Fix: rsyslogd: imklog: cannot open kernel log (/proc/kmsg): Operation not permitted.
+	&& sed -i''  's/.*imklog.*//g' /etc/rsyslog.conf \
+	\
+# Setup Supervisor
 	&& rm -rf /etc/supervisor* \
 	&& mkdir -p /var/log/supervisor \
 	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###

Dockerfiles/prod/Dockerfile-7.2

@@ -26,9 +26,8 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.2-prod"
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,18 +35,21 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
+# Fix: rsyslogd: imklog: cannot open kernel log (/proc/kmsg): Operation not permitted.
+	&& sed -i''  's/.*imklog.*//g' /etc/rsyslog.conf \
+	\
+# Setup Supervisor
 	&& rm -rf /etc/supervisor* \
 	&& mkdir -p /var/log/supervisor \
 	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###

Dockerfiles/prod/Dockerfile-7.3

@@ -26,9 +26,8 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.3-prod"
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,18 +35,21 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
+# Fix: rsyslogd: imklog: cannot open kernel log (/proc/kmsg): Operation not permitted.
+	&& sed -i''  's/.*imklog.*//g' /etc/rsyslog.conf \
+	\
+# Setup Supervisor
 	&& rm -rf /etc/supervisor* \
 	&& mkdir -p /var/log/supervisor \
 	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###

Dockerfiles/prod/Dockerfile-7.4

@@ -26,9 +26,8 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.4-prod"
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,18 +35,21 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
+# Fix: rsyslogd: imklog: cannot open kernel log (/proc/kmsg): Operation not permitted.
+	&& sed -i''  's/.*imklog.*//g' /etc/rsyslog.conf \
+	\
+# Setup Supervisor
 	&& rm -rf /etc/supervisor* \
 	&& mkdir -p /var/log/supervisor \
 	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###

Dockerfiles/prod/Dockerfile-8.0

@@ -26,9 +26,8 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 8.0-prod"
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,18 +35,21 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
+# Fix: rsyslogd: imklog: cannot open kernel log (/proc/kmsg): Operation not permitted.
+	&& sed -i''  's/.*imklog.*//g' /etc/rsyslog.conf \
+	\
+# Setup Supervisor
 	&& rm -rf /etc/supervisor* \
 	&& mkdir -p /var/log/supervisor \
 	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###

Dockerfiles/prod/Dockerfile-8.1

@@ -26,9 +26,8 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 8.1-prod"
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,18 +35,21 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
+# Fix: rsyslogd: imklog: cannot open kernel log (/proc/kmsg): Operation not permitted.
+	&& sed -i''  's/.*imklog.*//g' /etc/rsyslog.conf \
+	\
+# Setup Supervisor
 	&& rm -rf /etc/supervisor* \
 	&& mkdir -p /var/log/supervisor \
 	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###

Dockerfiles/prod/Dockerfile-8.2

@@ -26,9 +26,8 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 8.2-prod"
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,18 +35,21 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
+# Fix: rsyslogd: imklog: cannot open kernel log (/proc/kmsg): Operation not permitted.
+	&& sed -i''  's/.*imklog.*//g' /etc/rsyslog.conf \
+	\
+# Setup Supervisor
 	&& rm -rf /etc/supervisor* \
 	&& mkdir -p /var/log/supervisor \
 	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###

Dockerfiles/work/Dockerfile-5.2

@@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
@@ -56,20 +55,12 @@ RUN set -eux \
 		gnupg \
 		\
 	&& echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until \
-	&& echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo "deb [trusted=yes] http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
-	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -104,7 +95,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mysql-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -113,7 +106,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -131,30 +123,14 @@ RUN set -eux \
 		wget \
 		whois \
 		xz-utils \
-		yarn \
 		zip \
 		zlib1g-dev \
 		zsh \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-RUN set -eux \
-	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-		DEBIAN_FRONTEND=noninteractive apt-get update -q \
-		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
-			mongodb-org-shell \
-			mongodb-org-tools; \
-	fi \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -172,9 +148,18 @@ RUN set -eux \
  \
 	\
 # -------------------- nvm --------------------
-	&& git clone https://github.com/creationix/nvm /opt/nvm \
-&& cd /opt/nvm \
-&& git checkout "$(git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1))" \
+	&& NODE_VERSION="17" \
+ \
+	&& NVM_VERSION="$( \
+  curl -sS 'https://github.com/nvm-sh/nvm/releases' \
+  | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
+  | grep -Eo 'v?[.0-9]+' \
+  | sort -V \
+  | tail -1 \
+)" \
+&& mkdir -p /opt/nvm \
+&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
+  | NVM_DIR="/opt/nvm" bash \
 \
 && { \
   echo 'export NVM_DIR="/opt/nvm"'; \
@@ -182,13 +167,40 @@ RUN set -eux \
   echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion'; \
 } >> /home/devilbox/.bashrc \
 \
-&& chown -R devilbox:devilbox /opt/nvm \
+&& chown -R devilbox:devilbox "/opt/nvm" \
  \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm install node' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \
+	&& su  -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
+\
+&& chmod 0777 /opt/nvm \
+&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \
+&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+  && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+  && apt-get update; \
+fi \
+ \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    postgresql-client; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& apt-get update \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    mongodb-clients; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -206,27 +218,17 @@ RUN set -eux \
 && cd / && rm -rf /tmp/gitflow \
  \
 	\
-# -------------------- homebrew --------------------
-	&& git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \
-&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}"   >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \
-&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \
- \
-	\
 # -------------------- linkcheck --------------------
 	&& curl -sS -L --fail https://raw.githubusercontent.com/cytopia/linkcheck/master/linkcheck > /usr/local/bin/linkcheck \
 && chmod +x /usr/local/bin/linkcheck \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
-&& chmod +x mhsendmail_linux_amd64 \
-&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
+  && chmod +x mhsendmail_linux_amd64 \
+  && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \
+fi \
  \
 	\
 # -------------------- mysqldumpsecure --------------------
@@ -263,53 +265,60 @@ RUN set -eux \
  \
 	\
 # -------------------- wkhtmltopdf --------------------
-	&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
-&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
-&& dpkg -i /tmp/wkhtmltopdf.deb \
-&& rm -f /tmp/wkhtmltopdf.deb \
+	&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/wkhtmltopdf/releases | awk -F\" '/wkhtmltopdf.*.jessie_amd64\.deb/{print $(NF-1)}' | head -1 )" \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+    libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+  && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  ${VERSION} \
+  && dpkg -i /tmp/wkhtmltopdf.deb \
+  && rm -f /tmp/wkhtmltopdf.deb; \
+fi \
  \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-&& rm -rf /var/lib/apt/lists/* \
- \
-	\
-# -------------------- cleanup --------------------
-	&& rm -rf /home/${MY_USER}/.*json \
-&& rm -rf /home/${MY_USER}/.cache \
-&& rm -rf /home/${MY_USER}/.composer \
-&& rm -rf /home/${MY_USER}/.config \
-&& rm -rf /home/${MY_USER}/.drush \
-&& rm -rf /home/${MY_USER}/.subversion \
-&& rm -rf /home/${MY_USER}/.v8* \
-\
-&& rm -rf /root/.*json \
-&& rm -rf /root/.cache \
-&& rm -rf /root/.composer \
-&& rm -rf /root/.config \
-&& rm -rf /root/.drush \
-&& rm -rf /root/.subversion \
-&& rm -rf /root/.v8* \
-\
-&& rm -rf /tmp/* \
-&& (rm -rf /tmp/.* || true) \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+  && rm -rf /var/lib/apt/lists/*; \
+fi \
  \
 	\
 	\
-	&& (rm -rf /root/.gem || true ) \
-	&& (rm -rf /root/.cache || true) \
-	&& (rm -rf /root/.composer || true) \
-	&& (rm -rf /root/.config || true) \
-	&& (rm -rf /root/.npm || true) \
-	\
-	&& (rm -rf /home/devilbox/.cache || true) \
-	&& (rm -rf /home/devilbox/.composer || true) \
-	&& (rm -rf /home/devilbox/.config || true) \
-	&& (rm -rf /home/devilbox/.npm || true) \
 	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
 	&& (rm -rf /usr/local/src/composer/cache/* || true) \
-	&& rm -rf /tmp/* \
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 
@@ -318,12 +327,47 @@ RUN set -eux \
 ###
 RUN set -eux \
 	\
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -373,17 +417,52 @@ RUN set -eux \
 	&& su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \
 	\
 	\
-	&& ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
 	\
-	&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
-	&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox \
-	&& rm -rf /home/devilbox/.npm \
-	&& rm -rf /home/devilbox/.cache \
-	&& rm -rf /home/devilbox/.config \
-	&& rm -rf /tmp/* \
+	&& if [ -f "/opt/nvm/nvm.sh" ]; then \
+		ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
+		\
+		&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
+		&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox; \
+	fi \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -403,22 +482,53 @@ RUN set -eux \
 	&& gem install mdl -v 0.5.0 \
 	\
 	\
-	&& rm -rf /root/.gem \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
 ### Install pip (Python) packages
 ###
 RUN set -eux \
-# -------------------- ansible --------------------
-	&& pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \
-	\
 # -------------------- yamllint --------------------
 	&& pip install --no-cache-dir --force-reinstall yamllint || true \
 	\
@@ -426,13 +536,47 @@ RUN set -eux \
 	&& pip install --no-cache-dir --force-reinstall yq || true \
 	\
 	\
-	&& rm -rf /root/.cache/pip \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -479,19 +623,36 @@ RUN set -eux \
 
 RUN set -eux \
 # -------------------- Software --------------------
-	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \
+	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+&& su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '5.2' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '5.2' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
+ \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& git-flow version | grep -E '[0-9][.0-9]+' \
 	&& linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' \
 	&& mysqldump-secure --version | grep -E 'Version:\s*[0-9][.0-9]+' \
 	&& phpcs --version | grep -E 'version [0-9][.0-9]+' \
 	&& phpcbf --version | grep -E 'version [0-9][.0-9]+' \
-	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)"; fi \
 	\
 # -------------------- Composer --------------------
 	\
 # -------------------- PIP --------------------
-	&& ansible --version | grep -E '^ansible [0-9][.0-9]+$' \
 	&& yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \
 	&& yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \
 	\
@@ -512,14 +673,42 @@ RUN set -eux \
 	&& mdl --version | grep -E '[0-9][.0-9]+' \
 	\
 # -------------------- Cleanup --------------------
-	&& rm -rf /home/devilbox/.cache/ \
-	&& rm -rf /home/devilbox/.config/ \
-	&& rm -rf /root/.ansible \
-	&& rm -rf /root/.console \
-	&& rm -rf /root/.composer \
-	&& rm -rf /root/.drush \
-	&& rm -rf /root/.pm2 \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 

Dockerfiles/work/Dockerfile-5.3

@@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
@@ -56,20 +55,12 @@ RUN set -eux \
 		gnupg \
 		\
 	&& echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until \
-	&& echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo "deb [trusted=yes] http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
-	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -104,7 +95,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mysql-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -113,7 +106,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -131,30 +123,14 @@ RUN set -eux \
 		wget \
 		whois \
 		xz-utils \
-		yarn \
 		zip \
 		zlib1g-dev \
 		zsh \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-RUN set -eux \
-	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-		DEBIAN_FRONTEND=noninteractive apt-get update -q \
-		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
-			mongodb-org-shell \
-			mongodb-org-tools; \
-	fi \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -162,11 +138,15 @@ RUN set -eux \
 ###
 RUN set -eux \
 # -------------------- composer --------------------
-	&& curl -sS -L --fail https://getcomposer.org/composer-1.phar > /usr/local/bin/composer-1 \
-&& curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
+	&& COMPOSER_1_VERSION="latest-1.x" \
+&& COMPOSER_2_VERSION="latest-2.2.x" \
+ \
+	&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \
+&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \
 && chmod +x /usr/local/bin/composer-1 \
 && chmod +x /usr/local/bin/composer-2 \
-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+ \
+	&& ln -sf /usr/local/bin/composer-1 /usr/local/bin/composer \
  \
 	\
 # -------------------- pip --------------------
@@ -180,9 +160,18 @@ RUN set -eux \
  \
 	\
 # -------------------- nvm --------------------
-	&& git clone https://github.com/creationix/nvm /opt/nvm \
-&& cd /opt/nvm \
-&& git checkout "$(git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1))" \
+	&& NODE_VERSION="17" \
+ \
+	&& NVM_VERSION="$( \
+  curl -sS 'https://github.com/nvm-sh/nvm/releases' \
+  | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
+  | grep -Eo 'v?[.0-9]+' \
+  | sort -V \
+  | tail -1 \
+)" \
+&& mkdir -p /opt/nvm \
+&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
+  | NVM_DIR="/opt/nvm" bash \
 \
 && { \
   echo 'export NVM_DIR="/opt/nvm"'; \
@@ -190,13 +179,40 @@ RUN set -eux \
   echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion'; \
 } >> /home/devilbox/.bashrc \
 \
-&& chown -R devilbox:devilbox /opt/nvm \
+&& chown -R devilbox:devilbox "/opt/nvm" \
  \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm install node' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \
+	&& su  -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
+\
+&& chmod 0777 /opt/nvm \
+&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \
+&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+  && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+  && apt-get update; \
+fi \
+ \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    postgresql-client; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& apt-get update \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    mongodb-clients; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -228,27 +244,17 @@ RUN set -eux \
 && cd / && rm -rf /tmp/gitflow \
  \
 	\
-# -------------------- homebrew --------------------
-	&& git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \
-&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}"   >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \
-&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \
- \
-	\
 # -------------------- linkcheck --------------------
 	&& curl -sS -L --fail https://raw.githubusercontent.com/cytopia/linkcheck/master/linkcheck > /usr/local/bin/linkcheck \
 && chmod +x /usr/local/bin/linkcheck \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
-&& chmod +x mhsendmail_linux_amd64 \
-&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
+  && chmod +x mhsendmail_linux_amd64 \
+  && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \
+fi \
  \
 	\
 # -------------------- mysqldumpsecure --------------------
@@ -313,57 +319,64 @@ RUN set -eux \
  \
 	\
 # -------------------- wkhtmltopdf --------------------
-	&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
-&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
-&& dpkg -i /tmp/wkhtmltopdf.deb \
-&& rm -f /tmp/wkhtmltopdf.deb \
+	&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/wkhtmltopdf/releases | awk -F\" '/wkhtmltopdf.*.jessie_amd64\.deb/{print $(NF-1)}' | head -1 )" \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+    libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+  && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  ${VERSION} \
+  && dpkg -i /tmp/wkhtmltopdf.deb \
+  && rm -f /tmp/wkhtmltopdf.deb; \
+fi \
  \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-&& rm -rf /var/lib/apt/lists/* \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+  && rm -rf /var/lib/apt/lists/*; \
+fi \
  \
 	\
 # -------------------- wpcli --------------------
 	&& curl -sS -L --fail https://github.com/wp-cli/wp-cli/releases/download/v1.5.1/wp-cli-1.5.1.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
 	\
-# -------------------- cleanup --------------------
-	&& rm -rf /home/${MY_USER}/.*json \
-&& rm -rf /home/${MY_USER}/.cache \
-&& rm -rf /home/${MY_USER}/.composer \
-&& rm -rf /home/${MY_USER}/.config \
-&& rm -rf /home/${MY_USER}/.drush \
-&& rm -rf /home/${MY_USER}/.subversion \
-&& rm -rf /home/${MY_USER}/.v8* \
-\
-&& rm -rf /root/.*json \
-&& rm -rf /root/.cache \
-&& rm -rf /root/.composer \
-&& rm -rf /root/.config \
-&& rm -rf /root/.drush \
-&& rm -rf /root/.subversion \
-&& rm -rf /root/.v8* \
-\
-&& rm -rf /tmp/* \
-&& (rm -rf /tmp/.* || true) \
- \
 	\
 	\
-	&& (rm -rf /root/.gem || true ) \
-	&& (rm -rf /root/.cache || true) \
-	&& (rm -rf /root/.composer || true) \
-	&& (rm -rf /root/.config || true) \
-	&& (rm -rf /root/.npm || true) \
-	\
-	&& (rm -rf /home/devilbox/.cache || true) \
-	&& (rm -rf /home/devilbox/.composer || true) \
-	&& (rm -rf /home/devilbox/.config || true) \
-	&& (rm -rf /home/devilbox/.npm || true) \
-	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
 	&& (rm -rf /usr/local/src/composer/cache/* || true) \
-	&& rm -rf /tmp/* \
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 
@@ -375,12 +388,47 @@ RUN set -eux \
 	&& COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-1 global require  hirak/prestissimo \
 	\
 	\
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -430,17 +478,52 @@ RUN set -eux \
 	&& su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \
 	\
 	\
-	&& ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
 	\
-	&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
-	&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox \
-	&& rm -rf /home/devilbox/.npm \
-	&& rm -rf /home/devilbox/.cache \
-	&& rm -rf /home/devilbox/.config \
-	&& rm -rf /tmp/* \
+	&& if [ -f "/opt/nvm/nvm.sh" ]; then \
+		ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
+		\
+		&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
+		&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox; \
+	fi \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -460,22 +543,53 @@ RUN set -eux \
 	&& gem install mdl -v 0.5.0 \
 	\
 	\
-	&& rm -rf /root/.gem \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
 ### Install pip (Python) packages
 ###
 RUN set -eux \
-# -------------------- ansible --------------------
-	&& pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \
-	\
 # -------------------- yamllint --------------------
 	&& pip install --no-cache-dir --force-reinstall yamllint || true \
 	\
@@ -483,13 +597,47 @@ RUN set -eux \
 	&& pip install --no-cache-dir --force-reinstall yq || true \
 	\
 	\
-	&& rm -rf /root/.cache/pip \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -536,8 +684,26 @@ RUN set -eux \
 
 RUN set -eux \
 # -------------------- Software --------------------
-	&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \
+	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
+	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+&& su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '5.3' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '5.3' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
+ \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
 	&& git-flow version | grep -E '[0-9][.0-9]+' \
@@ -549,13 +715,12 @@ RUN set -eux \
 	&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
 	&& phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \
 	&& phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' \
-	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)"; fi \
 	&& wp --allow-root --version | grep -E '[0-9][.0-9]+' \
 	\
 # -------------------- Composer --------------------
 	\
 # -------------------- PIP --------------------
-	&& ansible --version | grep -E '^ansible [0-9][.0-9]+$' \
 	&& yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \
 	&& yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \
 	\
@@ -576,14 +741,42 @@ RUN set -eux \
 	&& mdl --version | grep -E '[0-9][.0-9]+' \
 	\
 # -------------------- Cleanup --------------------
-	&& rm -rf /home/devilbox/.cache/ \
-	&& rm -rf /home/devilbox/.config/ \
-	&& rm -rf /root/.ansible \
-	&& rm -rf /root/.console \
-	&& rm -rf /root/.composer \
-	&& rm -rf /root/.drush \
-	&& rm -rf /root/.pm2 \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 

Dockerfiles/work/Dockerfile-5.4

@@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
@@ -56,20 +55,12 @@ RUN set -eux \
 		gnupg \
 		\
 	&& echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until \
-	&& echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo "deb [trusted=yes] http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
-	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -104,7 +95,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mysql-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -113,7 +106,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -131,30 +123,14 @@ RUN set -eux \
 		wget \
 		whois \
 		xz-utils \
-		yarn \
 		zip \
 		zlib1g-dev \
 		zsh \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-RUN set -eux \
-	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-		DEBIAN_FRONTEND=noninteractive apt-get update -q \
-		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
-			mongodb-org-shell \
-			mongodb-org-tools; \
-	fi \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -162,11 +138,15 @@ RUN set -eux \
 ###
 RUN set -eux \
 # -------------------- composer --------------------
-	&& curl -sS -L --fail https://getcomposer.org/composer-1.phar > /usr/local/bin/composer-1 \
-&& curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
+	&& COMPOSER_1_VERSION="latest-1.x" \
+&& COMPOSER_2_VERSION="latest-2.2.x" \
+ \
+	&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \
+&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \
 && chmod +x /usr/local/bin/composer-1 \
 && chmod +x /usr/local/bin/composer-2 \
-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+ \
+	&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
  \
 	\
 # -------------------- pip --------------------
@@ -180,9 +160,18 @@ RUN set -eux \
  \
 	\
 # -------------------- nvm --------------------
-	&& git clone https://github.com/creationix/nvm /opt/nvm \
-&& cd /opt/nvm \
-&& git checkout "$(git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1))" \
+	&& NODE_VERSION="17" \
+ \
+	&& NVM_VERSION="$( \
+  curl -sS 'https://github.com/nvm-sh/nvm/releases' \
+  | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
+  | grep -Eo 'v?[.0-9]+' \
+  | sort -V \
+  | tail -1 \
+)" \
+&& mkdir -p /opt/nvm \
+&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
+  | NVM_DIR="/opt/nvm" bash \
 \
 && { \
   echo 'export NVM_DIR="/opt/nvm"'; \
@@ -190,13 +179,40 @@ RUN set -eux \
   echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion'; \
 } >> /home/devilbox/.bashrc \
 \
-&& chown -R devilbox:devilbox /opt/nvm \
+&& chown -R devilbox:devilbox "/opt/nvm" \
  \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm install node' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \
+	&& su  -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
+\
+&& chmod 0777 /opt/nvm \
+&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \
+&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+  && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+  && apt-get update; \
+fi \
+ \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    postgresql-client; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& apt-get update \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    mongodb-clients; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -246,18 +262,6 @@ RUN set -eux \
 && cd / && rm -rf /tmp/gitflow \
  \
 	\
-# -------------------- homebrew --------------------
-	&& git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \
-&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}"   >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \
-&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \
- \
-	\
 # -------------------- laravel --------------------
 	&& git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \
 && cd /usr/local/src/laravel-installer \
@@ -275,9 +279,11 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
-&& chmod +x mhsendmail_linux_amd64 \
-&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
+  && chmod +x mhsendmail_linux_amd64 \
+  && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \
+fi \
  \
 	\
 # -------------------- mysqldumpsecure --------------------
@@ -342,62 +348,71 @@ RUN set -eux \
  \
 	\
 # -------------------- symfony --------------------
-	&& SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \
-	&& curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \
-	&& chmod +x /usr/local/bin/symfony \
+	&& VERSION="$(curl -s https://api.github.com/repos/symfony-cli/symfony-cli/releases/latest | awk -F\" '/symfony-cli_.*._amd64\.deb/{print $(NF-1)}' | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')" \
+	&& curl -sS -L --fail -o /tmp/symfonycli.deb  https://github.com/symfony-cli/symfony-cli/releases/download/v${VERSION}/symfony-cli_${VERSION}_$(dpkg-architecture --query DEB_HOST_ARCH).deb \
+&& dpkg -i /tmp/symfonycli.deb \
+&& rm -f /tmp/symfonycli.deb \
+ \
 	\
 # -------------------- wkhtmltopdf --------------------
-	&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
-&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
-&& dpkg -i /tmp/wkhtmltopdf.deb \
-&& rm -f /tmp/wkhtmltopdf.deb \
+	&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/wkhtmltopdf/releases | awk -F\" '/wkhtmltopdf.*.jessie_amd64\.deb/{print $(NF-1)}' | head -1 )" \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+    libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+  && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  ${VERSION} \
+  && dpkg -i /tmp/wkhtmltopdf.deb \
+  && rm -f /tmp/wkhtmltopdf.deb; \
+fi \
  \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-&& rm -rf /var/lib/apt/lists/* \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+  && rm -rf /var/lib/apt/lists/*; \
+fi \
  \
 	\
 # -------------------- wpcli --------------------
 	&& curl -sS -L --fail https://github.com/wp-cli/wp-cli/releases/download/v2.4.0/wp-cli-2.4.0.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
 	\
-# -------------------- cleanup --------------------
-	&& rm -rf /home/${MY_USER}/.*json \
-&& rm -rf /home/${MY_USER}/.cache \
-&& rm -rf /home/${MY_USER}/.composer \
-&& rm -rf /home/${MY_USER}/.config \
-&& rm -rf /home/${MY_USER}/.drush \
-&& rm -rf /home/${MY_USER}/.subversion \
-&& rm -rf /home/${MY_USER}/.v8* \
-\
-&& rm -rf /root/.*json \
-&& rm -rf /root/.cache \
-&& rm -rf /root/.composer \
-&& rm -rf /root/.config \
-&& rm -rf /root/.drush \
-&& rm -rf /root/.subversion \
-&& rm -rf /root/.v8* \
-\
-&& rm -rf /tmp/* \
-&& (rm -rf /tmp/.* || true) \
- \
 	\
 	\
-	&& (rm -rf /root/.gem || true ) \
-	&& (rm -rf /root/.cache || true) \
-	&& (rm -rf /root/.composer || true) \
-	&& (rm -rf /root/.config || true) \
-	&& (rm -rf /root/.npm || true) \
-	\
-	&& (rm -rf /home/devilbox/.cache || true) \
-	&& (rm -rf /home/devilbox/.composer || true) \
-	&& (rm -rf /home/devilbox/.config || true) \
-	&& (rm -rf /home/devilbox/.npm || true) \
-	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
 	&& (rm -rf /usr/local/src/composer/cache/* || true) \
-	&& rm -rf /tmp/* \
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 
@@ -413,12 +428,47 @@ RUN set -eux \
 	&& COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-1 global require  hirak/prestissimo \
 	\
 	\
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -468,17 +518,52 @@ RUN set -eux \
 	&& su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \
 	\
 	\
-	&& ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
 	\
-	&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
-	&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox \
-	&& rm -rf /home/devilbox/.npm \
-	&& rm -rf /home/devilbox/.cache \
-	&& rm -rf /home/devilbox/.config \
-	&& rm -rf /tmp/* \
+	&& if [ -f "/opt/nvm/nvm.sh" ]; then \
+		ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
+		\
+		&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
+		&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox; \
+	fi \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -498,22 +583,53 @@ RUN set -eux \
 	&& gem install mdl -v 0.5.0 \
 	\
 	\
-	&& rm -rf /root/.gem \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
 ### Install pip (Python) packages
 ###
 RUN set -eux \
-# -------------------- ansible --------------------
-	&& pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \
-	\
 # -------------------- yamllint --------------------
 	&& pip install --no-cache-dir --force-reinstall yamllint || true \
 	\
@@ -521,13 +637,47 @@ RUN set -eux \
 	&& pip install --no-cache-dir --force-reinstall yq || true \
 	\
 	\
-	&& rm -rf /root/.cache/pip \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -574,8 +724,26 @@ RUN set -eux \
 
 RUN set -eux \
 # -------------------- Software --------------------
-	&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \
+	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
+	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+&& su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '5.4' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '5.4' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
+ \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
@@ -590,15 +758,14 @@ RUN set -eux \
 	&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
 	&& phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \
 	&& phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' \
-	&& symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \
-	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" \
+	&& symfony -V | grep -Ei 'version\s[0-9][.0-9]+' \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)"; fi \
 	&& wp --allow-root --version | grep -E '[0-9][.0-9]+' \
 	\
 # -------------------- Composer --------------------
 	&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' \
 	\
 # -------------------- PIP --------------------
-	&& ansible --version | grep -E '^ansible [0-9][.0-9]+$' \
 	&& yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \
 	&& yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \
 	\
@@ -619,14 +786,42 @@ RUN set -eux \
 	&& mdl --version | grep -E '[0-9][.0-9]+' \
 	\
 # -------------------- Cleanup --------------------
-	&& rm -rf /home/devilbox/.cache/ \
-	&& rm -rf /home/devilbox/.config/ \
-	&& rm -rf /root/.ansible \
-	&& rm -rf /root/.console \
-	&& rm -rf /root/.composer \
-	&& rm -rf /root/.drush \
-	&& rm -rf /root/.pm2 \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 

Dockerfiles/work/Dockerfile-5.5

@@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
@@ -56,20 +55,12 @@ RUN set -eux \
 		gnupg \
 		\
 	&& echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until \
-	&& echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo "deb [trusted=yes] http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
-	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -104,7 +95,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mysql-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -113,7 +106,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -131,30 +123,14 @@ RUN set -eux \
 		wget \
 		whois \
 		xz-utils \
-		yarn \
 		zip \
 		zlib1g-dev \
 		zsh \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-RUN set -eux \
-	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-		DEBIAN_FRONTEND=noninteractive apt-get update -q \
-		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
-			mongodb-org-shell \
-			mongodb-org-tools; \
-	fi \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -162,11 +138,15 @@ RUN set -eux \
 ###
 RUN set -eux \
 # -------------------- composer --------------------
-	&& curl -sS -L --fail https://getcomposer.org/composer-1.phar > /usr/local/bin/composer-1 \
-&& curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
+	&& COMPOSER_1_VERSION="latest-1.x" \
+&& COMPOSER_2_VERSION="latest-2.2.x" \
+ \
+	&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \
+&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \
 && chmod +x /usr/local/bin/composer-1 \
 && chmod +x /usr/local/bin/composer-2 \
-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+ \
+	&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
  \
 	\
 # -------------------- pip --------------------
@@ -180,9 +160,18 @@ RUN set -eux \
  \
 	\
 # -------------------- nvm --------------------
-	&& git clone https://github.com/creationix/nvm /opt/nvm \
-&& cd /opt/nvm \
-&& git checkout "$(git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1))" \
+	&& NODE_VERSION="17" \
+ \
+	&& NVM_VERSION="$( \
+  curl -sS 'https://github.com/nvm-sh/nvm/releases' \
+  | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
+  | grep -Eo 'v?[.0-9]+' \
+  | sort -V \
+  | tail -1 \
+)" \
+&& mkdir -p /opt/nvm \
+&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
+  | NVM_DIR="/opt/nvm" bash \
 \
 && { \
   echo 'export NVM_DIR="/opt/nvm"'; \
@@ -190,13 +179,40 @@ RUN set -eux \
   echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion'; \
 } >> /home/devilbox/.bashrc \
 \
-&& chown -R devilbox:devilbox /opt/nvm \
+&& chown -R devilbox:devilbox "/opt/nvm" \
  \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm install node' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \
+	&& su  -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
+\
+&& chmod 0777 /opt/nvm \
+&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \
+&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+  && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+  && apt-get update; \
+fi \
+ \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    postgresql-client; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& apt-get update \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    mongodb-clients; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -251,18 +267,6 @@ RUN set -eux \
 && cd / && rm -rf /tmp/gitflow \
  \
 	\
-# -------------------- homebrew --------------------
-	&& git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \
-&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}"   >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \
-&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \
- \
-	\
 # -------------------- laravel --------------------
 	&& git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \
 && cd /usr/local/src/laravel-installer \
@@ -280,9 +284,11 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
-&& chmod +x mhsendmail_linux_amd64 \
-&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
+  && chmod +x mhsendmail_linux_amd64 \
+  && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \
+fi \
  \
 	\
 # -------------------- mysqldumpsecure --------------------
@@ -348,62 +354,71 @@ RUN set -eux \
  \
 	\
 # -------------------- symfony --------------------
-	&& SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \
-	&& curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \
-	&& chmod +x /usr/local/bin/symfony \
+	&& VERSION="$(curl -s https://api.github.com/repos/symfony-cli/symfony-cli/releases/latest | awk -F\" '/symfony-cli_.*._amd64\.deb/{print $(NF-1)}' | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')" \
+	&& curl -sS -L --fail -o /tmp/symfonycli.deb  https://github.com/symfony-cli/symfony-cli/releases/download/v${VERSION}/symfony-cli_${VERSION}_$(dpkg-architecture --query DEB_HOST_ARCH).deb \
+&& dpkg -i /tmp/symfonycli.deb \
+&& rm -f /tmp/symfonycli.deb \
+ \
 	\
 # -------------------- wkhtmltopdf --------------------
-	&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
-&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
-&& dpkg -i /tmp/wkhtmltopdf.deb \
-&& rm -f /tmp/wkhtmltopdf.deb \
+	&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/wkhtmltopdf/releases | awk -F\" '/wkhtmltopdf.*.jessie_amd64\.deb/{print $(NF-1)}' | head -1 )" \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+    libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+  && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  ${VERSION} \
+  && dpkg -i /tmp/wkhtmltopdf.deb \
+  && rm -f /tmp/wkhtmltopdf.deb; \
+fi \
  \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-&& rm -rf /var/lib/apt/lists/* \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+  && rm -rf /var/lib/apt/lists/*; \
+fi \
  \
 	\
 # -------------------- wpcli --------------------
 	&& curl -sS -L --fail https://github.com/wp-cli/wp-cli/releases/download/v2.4.0/wp-cli-2.4.0.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
 	\
-# -------------------- cleanup --------------------
-	&& rm -rf /home/${MY_USER}/.*json \
-&& rm -rf /home/${MY_USER}/.cache \
-&& rm -rf /home/${MY_USER}/.composer \
-&& rm -rf /home/${MY_USER}/.config \
-&& rm -rf /home/${MY_USER}/.drush \
-&& rm -rf /home/${MY_USER}/.subversion \
-&& rm -rf /home/${MY_USER}/.v8* \
-\
-&& rm -rf /root/.*json \
-&& rm -rf /root/.cache \
-&& rm -rf /root/.composer \
-&& rm -rf /root/.config \
-&& rm -rf /root/.drush \
-&& rm -rf /root/.subversion \
-&& rm -rf /root/.v8* \
-\
-&& rm -rf /tmp/* \
-&& (rm -rf /tmp/.* || true) \
- \
 	\
 	\
-	&& (rm -rf /root/.gem || true ) \
-	&& (rm -rf /root/.cache || true) \
-	&& (rm -rf /root/.composer || true) \
-	&& (rm -rf /root/.config || true) \
-	&& (rm -rf /root/.npm || true) \
-	\
-	&& (rm -rf /home/devilbox/.cache || true) \
-	&& (rm -rf /home/devilbox/.composer || true) \
-	&& (rm -rf /home/devilbox/.config || true) \
-	&& (rm -rf /home/devilbox/.npm || true) \
-	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
 	&& (rm -rf /usr/local/src/composer/cache/* || true) \
-	&& rm -rf /tmp/* \
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 
@@ -427,12 +442,47 @@ RUN set -eux \
 	&& COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-1 global require  hirak/prestissimo \
 	\
 	\
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -482,17 +532,52 @@ RUN set -eux \
 	&& su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \
 	\
 	\
-	&& ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
 	\
-	&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
-	&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox \
-	&& rm -rf /home/devilbox/.npm \
-	&& rm -rf /home/devilbox/.cache \
-	&& rm -rf /home/devilbox/.config \
-	&& rm -rf /tmp/* \
+	&& if [ -f "/opt/nvm/nvm.sh" ]; then \
+		ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
+		\
+		&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
+		&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox; \
+	fi \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -512,22 +597,53 @@ RUN set -eux \
 	&& gem install mdl -v 0.5.0 \
 	\
 	\
-	&& rm -rf /root/.gem \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
 ### Install pip (Python) packages
 ###
 RUN set -eux \
-# -------------------- ansible --------------------
-	&& pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \
-	\
 # -------------------- yamllint --------------------
 	&& pip install --no-cache-dir --force-reinstall yamllint || true \
 	\
@@ -535,13 +651,47 @@ RUN set -eux \
 	&& pip install --no-cache-dir --force-reinstall yq || true \
 	\
 	\
-	&& rm -rf /root/.cache/pip \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -588,8 +738,26 @@ RUN set -eux \
 
 RUN set -eux \
 # -------------------- Software --------------------
-	&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \
+	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
+	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+&& su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '5.5' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '5.5' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
+ \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
@@ -605,8 +773,8 @@ RUN set -eux \
 	&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
 	&& phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \
 	&& phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' \
-	&& symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \
-	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" \
+	&& symfony -V | grep -Ei 'version\s[0-9][.0-9]+' \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)"; fi \
 	&& wp --allow-root --version | grep -E '[0-9][.0-9]+' \
 	\
 # -------------------- Composer --------------------
@@ -615,7 +783,6 @@ RUN set -eux \
 	&& lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[0-9][.0-9]+$' \
 	\
 # -------------------- PIP --------------------
-	&& ansible --version | grep -E '^ansible [0-9][.0-9]+$' \
 	&& yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \
 	&& yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \
 	\
@@ -636,14 +803,42 @@ RUN set -eux \
 	&& mdl --version | grep -E '[0-9][.0-9]+' \
 	\
 # -------------------- Cleanup --------------------
-	&& rm -rf /home/devilbox/.cache/ \
-	&& rm -rf /home/devilbox/.config/ \
-	&& rm -rf /root/.ansible \
-	&& rm -rf /root/.console \
-	&& rm -rf /root/.composer \
-	&& rm -rf /root/.drush \
-	&& rm -rf /root/.pm2 \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 

Dockerfiles/work/Dockerfile-5.6

@@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
@@ -59,17 +58,9 @@ RUN set -eux \
 	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 \
-	&& echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -105,7 +96,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mysql-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -114,7 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -132,31 +124,15 @@ RUN set -eux \
 		wget \
 		whois \
 		xz-utils \
-		yarn \
 		zip \
 		zlib1g-dev \
 		zsh \
 		zsh-common \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-RUN set -eux \
-	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-		DEBIAN_FRONTEND=noninteractive apt-get update -q \
-		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
-			mongodb-org-shell \
-			mongodb-org-tools; \
-	fi \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -164,11 +140,15 @@ RUN set -eux \
 ###
 RUN set -eux \
 # -------------------- composer --------------------
-	&& curl -sS -L --fail https://getcomposer.org/composer-1.phar > /usr/local/bin/composer-1 \
-&& curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
+	&& COMPOSER_1_VERSION="latest-1.x" \
+&& COMPOSER_2_VERSION="latest-2.2.x" \
+ \
+	&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \
+&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \
 && chmod +x /usr/local/bin/composer-1 \
 && chmod +x /usr/local/bin/composer-2 \
-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+ \
+	&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
  \
 	\
 # -------------------- pip --------------------
@@ -182,9 +162,18 @@ RUN set -eux \
  \
 	\
 # -------------------- nvm --------------------
-	&& git clone https://github.com/creationix/nvm /opt/nvm \
-&& cd /opt/nvm \
-&& git checkout "$(git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1))" \
+	&& NODE_VERSION="17" \
+ \
+	&& NVM_VERSION="$( \
+  curl -sS 'https://github.com/nvm-sh/nvm/releases' \
+  | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
+  | grep -Eo 'v?[.0-9]+' \
+  | sort -V \
+  | tail -1 \
+)" \
+&& mkdir -p /opt/nvm \
+&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
+  | NVM_DIR="/opt/nvm" bash \
 \
 && { \
   echo 'export NVM_DIR="/opt/nvm"'; \
@@ -192,13 +181,44 @@ RUN set -eux \
   echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion'; \
 } >> /home/devilbox/.bashrc \
 \
-&& chown -R devilbox:devilbox /opt/nvm \
+&& chown -R devilbox:devilbox "/opt/nvm" \
  \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm install node' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \
+	&& su  -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
+\
+&& chmod 0777 /opt/nvm \
+&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \
+&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+  && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+  && apt-get update; \
+fi \
+ \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    postgresql-client; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& apt-get update \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    mongodb-clients \
+    mongo-tools; \
+else \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    mongodb-clients; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -267,18 +287,6 @@ RUN set -eux \
 && cd / && rm -rf /tmp/gitflow \
  \
 	\
-# -------------------- homebrew --------------------
-	&& git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \
-&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}"   >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \
-&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \
- \
-	\
 # -------------------- laravel --------------------
 	&& git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \
 && cd /usr/local/src/laravel-installer \
@@ -296,9 +304,11 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
-&& chmod +x mhsendmail_linux_amd64 \
-&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
+  && chmod +x mhsendmail_linux_amd64 \
+  && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \
+fi \
  \
 	\
 # -------------------- mysqldumpsecure --------------------
@@ -364,62 +374,71 @@ RUN set -eux \
  \
 	\
 # -------------------- symfony --------------------
-	&& SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \
-	&& curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \
-	&& chmod +x /usr/local/bin/symfony \
+	&& VERSION="$(curl -s https://api.github.com/repos/symfony-cli/symfony-cli/releases/latest | awk -F\" '/symfony-cli_.*._amd64\.deb/{print $(NF-1)}' | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')" \
+	&& curl -sS -L --fail -o /tmp/symfonycli.deb  https://github.com/symfony-cli/symfony-cli/releases/download/v${VERSION}/symfony-cli_${VERSION}_$(dpkg-architecture --query DEB_HOST_ARCH).deb \
+&& dpkg -i /tmp/symfonycli.deb \
+&& rm -f /tmp/symfonycli.deb \
+ \
 	\
 # -------------------- wkhtmltopdf --------------------
-	&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
-&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
-&& dpkg -i /tmp/wkhtmltopdf.deb \
-&& rm -f /tmp/wkhtmltopdf.deb \
+	&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases | awk -F\" '/wkhtmltopdf.*.stretch_amd64\.deb/{print $(NF-1)}' | head -1 )" \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+    libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+  && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  ${VERSION} \
+  && dpkg -i /tmp/wkhtmltopdf.deb \
+  && rm -f /tmp/wkhtmltopdf.deb; \
+fi \
  \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-&& rm -rf /var/lib/apt/lists/* \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+  && rm -rf /var/lib/apt/lists/*; \
+fi \
  \
 	\
 # -------------------- wpcli --------------------
 	&& curl -sS -L --fail https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
 	\
-# -------------------- cleanup --------------------
-	&& rm -rf /home/${MY_USER}/.*json \
-&& rm -rf /home/${MY_USER}/.cache \
-&& rm -rf /home/${MY_USER}/.composer \
-&& rm -rf /home/${MY_USER}/.config \
-&& rm -rf /home/${MY_USER}/.drush \
-&& rm -rf /home/${MY_USER}/.subversion \
-&& rm -rf /home/${MY_USER}/.v8* \
-\
-&& rm -rf /root/.*json \
-&& rm -rf /root/.cache \
-&& rm -rf /root/.composer \
-&& rm -rf /root/.config \
-&& rm -rf /root/.drush \
-&& rm -rf /root/.subversion \
-&& rm -rf /root/.v8* \
-\
-&& rm -rf /tmp/* \
-&& (rm -rf /tmp/.* || true) \
- \
 	\
 	\
-	&& (rm -rf /root/.gem || true ) \
-	&& (rm -rf /root/.cache || true) \
-	&& (rm -rf /root/.composer || true) \
-	&& (rm -rf /root/.config || true) \
-	&& (rm -rf /root/.npm || true) \
-	\
-	&& (rm -rf /home/devilbox/.cache || true) \
-	&& (rm -rf /home/devilbox/.composer || true) \
-	&& (rm -rf /home/devilbox/.config || true) \
-	&& (rm -rf /home/devilbox/.npm || true) \
-	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
 	&& (rm -rf /usr/local/src/composer/cache/* || true) \
-	&& rm -rf /tmp/* \
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 
@@ -443,12 +462,47 @@ RUN set -eux \
 	&& COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-1 global require  hirak/prestissimo \
 	\
 	\
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -498,17 +552,52 @@ RUN set -eux \
 	&& su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \
 	\
 	\
-	&& ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
 	\
-	&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
-	&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox \
-	&& rm -rf /home/devilbox/.npm \
-	&& rm -rf /home/devilbox/.cache \
-	&& rm -rf /home/devilbox/.config \
-	&& rm -rf /tmp/* \
+	&& if [ -f "/opt/nvm/nvm.sh" ]; then \
+		ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
+		\
+		&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
+		&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox; \
+	fi \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -525,22 +614,53 @@ RUN set -eux \
 	&& gem install mdl -v 0.5.0 \
 	\
 	\
-	&& rm -rf /root/.gem \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
 ### Install pip (Python) packages
 ###
 RUN set -eux \
-# -------------------- ansible --------------------
-	&& pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \
-	\
 # -------------------- yamllint --------------------
 	&& pip install --no-cache-dir --force-reinstall yamllint || true \
 	\
@@ -548,13 +668,47 @@ RUN set -eux \
 	&& pip install --no-cache-dir --force-reinstall yq || true \
 	\
 	\
-	&& rm -rf /root/.cache/pip \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -601,8 +755,26 @@ RUN set -eux \
 
 RUN set -eux \
 # -------------------- Software --------------------
-	&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \
+	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
+	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+&& su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '5.6' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '5.6' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
+ \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
@@ -619,8 +791,8 @@ RUN set -eux \
 	&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
 	&& phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \
 	&& phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' \
-	&& symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \
-	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" \
+	&& symfony -V | grep -Ei 'version\s[0-9][.0-9]+' \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)"; fi \
 	&& wp --allow-root --version | grep -E '[0-9][.0-9]+' \
 	\
 # -------------------- Composer --------------------
@@ -629,7 +801,6 @@ RUN set -eux \
 	&& lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[0-9][.0-9]+$' \
 	\
 # -------------------- PIP --------------------
-	&& ansible --version | grep -E '^ansible [0-9][.0-9]+$' \
 	&& yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \
 	&& yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \
 	\
@@ -650,14 +821,42 @@ RUN set -eux \
 	&& mdl --version | grep -E '[0-9][.0-9]+' \
 	\
 # -------------------- Cleanup --------------------
-	&& rm -rf /home/devilbox/.cache/ \
-	&& rm -rf /home/devilbox/.config/ \
-	&& rm -rf /root/.ansible \
-	&& rm -rf /root/.console \
-	&& rm -rf /root/.composer \
-	&& rm -rf /root/.drush \
-	&& rm -rf /root/.pm2 \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 

Dockerfiles/work/Dockerfile-7.0

@@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
@@ -59,17 +58,9 @@ RUN set -eux \
 	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 \
-	&& echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -105,7 +96,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mysql-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -114,7 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -132,31 +124,15 @@ RUN set -eux \
 		wget \
 		whois \
 		xz-utils \
-		yarn \
 		zip \
 		zlib1g-dev \
 		zsh \
 		zsh-common \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-RUN set -eux \
-	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-		DEBIAN_FRONTEND=noninteractive apt-get update -q \
-		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
-			mongodb-org-shell \
-			mongodb-org-tools; \
-	fi \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -164,11 +140,15 @@ RUN set -eux \
 ###
 RUN set -eux \
 # -------------------- composer --------------------
-	&& curl -sS -L --fail https://getcomposer.org/composer-1.phar > /usr/local/bin/composer-1 \
-&& curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
+	&& COMPOSER_1_VERSION="latest-1.x" \
+&& COMPOSER_2_VERSION="latest-2.2.x" \
+ \
+	&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \
+&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \
 && chmod +x /usr/local/bin/composer-1 \
 && chmod +x /usr/local/bin/composer-2 \
-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+ \
+	&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
  \
 	\
 # -------------------- pip --------------------
@@ -182,9 +162,18 @@ RUN set -eux \
  \
 	\
 # -------------------- nvm --------------------
-	&& git clone https://github.com/creationix/nvm /opt/nvm \
-&& cd /opt/nvm \
-&& git checkout "$(git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1))" \
+	&& NODE_VERSION="17" \
+ \
+	&& NVM_VERSION="$( \
+  curl -sS 'https://github.com/nvm-sh/nvm/releases' \
+  | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
+  | grep -Eo 'v?[.0-9]+' \
+  | sort -V \
+  | tail -1 \
+)" \
+&& mkdir -p /opt/nvm \
+&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
+  | NVM_DIR="/opt/nvm" bash \
 \
 && { \
   echo 'export NVM_DIR="/opt/nvm"'; \
@@ -192,13 +181,44 @@ RUN set -eux \
   echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion'; \
 } >> /home/devilbox/.bashrc \
 \
-&& chown -R devilbox:devilbox /opt/nvm \
+&& chown -R devilbox:devilbox "/opt/nvm" \
  \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm install node' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \
+	&& su  -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
+\
+&& chmod 0777 /opt/nvm \
+&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \
+&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+  && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+  && apt-get update; \
+fi \
+ \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    postgresql-client; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& apt-get update \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    mongodb-clients \
+    mongo-tools; \
+else \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    mongodb-clients; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -248,18 +268,6 @@ RUN set -eux \
 && cd / && rm -rf /tmp/gitflow \
  \
 	\
-# -------------------- homebrew --------------------
-	&& git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \
-&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}"   >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \
-&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \
- \
-	\
 # -------------------- laravel --------------------
 	&& git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \
 && cd /usr/local/src/laravel-installer \
@@ -277,9 +285,11 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
-&& chmod +x mhsendmail_linux_amd64 \
-&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
+  && chmod +x mhsendmail_linux_amd64 \
+  && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \
+fi \
  \
 	\
 # -------------------- mysqldumpsecure --------------------
@@ -345,62 +355,71 @@ RUN set -eux \
  \
 	\
 # -------------------- symfony --------------------
-	&& SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \
-	&& curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \
-	&& chmod +x /usr/local/bin/symfony \
+	&& VERSION="$(curl -s https://api.github.com/repos/symfony-cli/symfony-cli/releases/latest | awk -F\" '/symfony-cli_.*._amd64\.deb/{print $(NF-1)}' | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')" \
+	&& curl -sS -L --fail -o /tmp/symfonycli.deb  https://github.com/symfony-cli/symfony-cli/releases/download/v${VERSION}/symfony-cli_${VERSION}_$(dpkg-architecture --query DEB_HOST_ARCH).deb \
+&& dpkg -i /tmp/symfonycli.deb \
+&& rm -f /tmp/symfonycli.deb \
+ \
 	\
 # -------------------- wkhtmltopdf --------------------
-	&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
-&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
-&& dpkg -i /tmp/wkhtmltopdf.deb \
-&& rm -f /tmp/wkhtmltopdf.deb \
+	&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases | awk -F\" '/wkhtmltopdf.*.stretch_amd64\.deb/{print $(NF-1)}' | head -1 )" \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+    libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+  && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  ${VERSION} \
+  && dpkg -i /tmp/wkhtmltopdf.deb \
+  && rm -f /tmp/wkhtmltopdf.deb; \
+fi \
  \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-&& rm -rf /var/lib/apt/lists/* \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+  && rm -rf /var/lib/apt/lists/*; \
+fi \
  \
 	\
 # -------------------- wpcli --------------------
 	&& curl -sS -L --fail https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
 	\
-# -------------------- cleanup --------------------
-	&& rm -rf /home/${MY_USER}/.*json \
-&& rm -rf /home/${MY_USER}/.cache \
-&& rm -rf /home/${MY_USER}/.composer \
-&& rm -rf /home/${MY_USER}/.config \
-&& rm -rf /home/${MY_USER}/.drush \
-&& rm -rf /home/${MY_USER}/.subversion \
-&& rm -rf /home/${MY_USER}/.v8* \
-\
-&& rm -rf /root/.*json \
-&& rm -rf /root/.cache \
-&& rm -rf /root/.composer \
-&& rm -rf /root/.config \
-&& rm -rf /root/.drush \
-&& rm -rf /root/.subversion \
-&& rm -rf /root/.v8* \
-\
-&& rm -rf /tmp/* \
-&& (rm -rf /tmp/.* || true) \
- \
 	\
 	\
-	&& (rm -rf /root/.gem || true ) \
-	&& (rm -rf /root/.cache || true) \
-	&& (rm -rf /root/.composer || true) \
-	&& (rm -rf /root/.config || true) \
-	&& (rm -rf /root/.npm || true) \
-	\
-	&& (rm -rf /home/devilbox/.cache || true) \
-	&& (rm -rf /home/devilbox/.composer || true) \
-	&& (rm -rf /home/devilbox/.config || true) \
-	&& (rm -rf /home/devilbox/.npm || true) \
-	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
 	&& (rm -rf /usr/local/src/composer/cache/* || true) \
-	&& rm -rf /tmp/* \
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 
@@ -424,12 +443,47 @@ RUN set -eux \
 	&& COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-1 global require  hirak/prestissimo \
 	\
 	\
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -479,17 +533,52 @@ RUN set -eux \
 	&& su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \
 	\
 	\
-	&& ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
 	\
-	&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
-	&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox \
-	&& rm -rf /home/devilbox/.npm \
-	&& rm -rf /home/devilbox/.cache \
-	&& rm -rf /home/devilbox/.config \
-	&& rm -rf /tmp/* \
+	&& if [ -f "/opt/nvm/nvm.sh" ]; then \
+		ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
+		\
+		&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
+		&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox; \
+	fi \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -506,22 +595,53 @@ RUN set -eux \
 	&& gem install mdl -v 0.5.0 \
 	\
 	\
-	&& rm -rf /root/.gem \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
 ### Install pip (Python) packages
 ###
 RUN set -eux \
-# -------------------- ansible --------------------
-	&& pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \
-	\
 # -------------------- yamllint --------------------
 	&& pip install --no-cache-dir --force-reinstall yamllint || true \
 	\
@@ -529,13 +649,47 @@ RUN set -eux \
 	&& pip install --no-cache-dir --force-reinstall yq || true \
 	\
 	\
-	&& rm -rf /root/.cache/pip \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -582,8 +736,26 @@ RUN set -eux \
 
 RUN set -eux \
 # -------------------- Software --------------------
-	&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \
+	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
+	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+&& su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '7.0' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '7.0' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
+ \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
@@ -598,8 +770,8 @@ RUN set -eux \
 	&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
 	&& phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \
 	&& phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' \
-	&& symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \
-	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" \
+	&& symfony -V | grep -Ei 'version\s[0-9][.0-9]+' \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)"; fi \
 	&& wp --allow-root --version | grep -E '[0-9][.0-9]+' \
 	\
 # -------------------- Composer --------------------
@@ -608,7 +780,6 @@ RUN set -eux \
 	&& lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[0-9][.0-9]+$' \
 	\
 # -------------------- PIP --------------------
-	&& ansible --version | grep -E '^ansible [0-9][.0-9]+$' \
 	&& yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \
 	&& yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \
 	\
@@ -629,14 +800,42 @@ RUN set -eux \
 	&& mdl --version | grep -E '[0-9][.0-9]+' \
 	\
 # -------------------- Cleanup --------------------
-	&& rm -rf /home/devilbox/.cache/ \
-	&& rm -rf /home/devilbox/.config/ \
-	&& rm -rf /root/.ansible \
-	&& rm -rf /root/.console \
-	&& rm -rf /root/.composer \
-	&& rm -rf /root/.drush \
-	&& rm -rf /root/.pm2 \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 

Dockerfiles/work/Dockerfile-7.1

@@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
@@ -56,20 +55,12 @@ RUN set -eux \
 		gnupg \
 		\
 	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \
-	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo "deb http://ftp.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 \
-	&& echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -105,7 +96,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mariadb-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -114,7 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -132,30 +124,14 @@ RUN set -eux \
 		wget \
 		whois \
 		xz-utils \
-		yarn \
 		zip \
 		zlib1g-dev \
 		zsh \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-RUN set -eux \
-	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-		DEBIAN_FRONTEND=noninteractive apt-get update -q \
-		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
-			mongodb-org-shell \
-			mongodb-org-tools; \
-	fi \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -163,11 +139,15 @@ RUN set -eux \
 ###
 RUN set -eux \
 # -------------------- composer --------------------
-	&& curl -sS -L --fail https://getcomposer.org/composer-1.phar > /usr/local/bin/composer-1 \
-&& curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
+	&& COMPOSER_1_VERSION="latest-1.x" \
+&& COMPOSER_2_VERSION="latest-2.2.x" \
+ \
+	&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \
+&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \
 && chmod +x /usr/local/bin/composer-1 \
 && chmod +x /usr/local/bin/composer-2 \
-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+ \
+	&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
  \
 	\
 # -------------------- pip --------------------
@@ -181,9 +161,18 @@ RUN set -eux \
  \
 	\
 # -------------------- nvm --------------------
-	&& git clone https://github.com/creationix/nvm /opt/nvm \
-&& cd /opt/nvm \
-&& git checkout "$(git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1))" \
+	&& NODE_VERSION="--lts" \
+ \
+	&& NVM_VERSION="$( \
+  curl -sS 'https://github.com/nvm-sh/nvm/releases' \
+  | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
+  | grep -Eo 'v?[.0-9]+' \
+  | sort -V \
+  | tail -1 \
+)" \
+&& mkdir -p /opt/nvm \
+&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
+  | NVM_DIR="/opt/nvm" bash \
 \
 && { \
   echo 'export NVM_DIR="/opt/nvm"'; \
@@ -191,13 +180,38 @@ RUN set -eux \
   echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion'; \
 } >> /home/devilbox/.bashrc \
 \
-&& chown -R devilbox:devilbox /opt/nvm \
+&& chown -R devilbox:devilbox "/opt/nvm" \
  \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm install node' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \
+	&& su  -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
+\
+&& chmod 0777 /opt/nvm \
+&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \
+&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+&& echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  postgresql-client \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+&& echo "deb http://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  mongodb-org-tools \
+  mongodb-org-shell \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -247,18 +261,6 @@ RUN set -eux \
 && cd / && rm -rf /tmp/gitflow \
  \
 	\
-# -------------------- homebrew --------------------
-	&& git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \
-&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}"   >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \
-&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \
- \
-	\
 # -------------------- laravel --------------------
 	&& git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \
 && cd /usr/local/src/laravel-installer \
@@ -276,9 +278,11 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
-&& chmod +x mhsendmail_linux_amd64 \
-&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
+  && chmod +x mhsendmail_linux_amd64 \
+  && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \
+fi \
  \
 	\
 # -------------------- mysqldumpsecure --------------------
@@ -344,62 +348,71 @@ RUN set -eux \
  \
 	\
 # -------------------- symfony --------------------
-	&& SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \
-	&& curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \
-	&& chmod +x /usr/local/bin/symfony \
+	&& VERSION="$(curl -s https://api.github.com/repos/symfony-cli/symfony-cli/releases/latest | awk -F\" '/symfony-cli_.*._amd64\.deb/{print $(NF-1)}' | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')" \
+	&& curl -sS -L --fail -o /tmp/symfonycli.deb  https://github.com/symfony-cli/symfony-cli/releases/download/v${VERSION}/symfony-cli_${VERSION}_$(dpkg-architecture --query DEB_HOST_ARCH).deb \
+&& dpkg -i /tmp/symfonycli.deb \
+&& rm -f /tmp/symfonycli.deb \
+ \
 	\
 # -------------------- wkhtmltopdf --------------------
-	&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-  libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
-&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
-&& dpkg -i /tmp/wkhtmltopdf.deb \
-&& rm -f /tmp/wkhtmltopdf.deb \
+	&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases | awk -F\" '/wkhtmltopdf.*.stretch_amd64\.deb/{print $(NF-1)}' | head -1 )" \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+    libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+  && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  ${VERSION} \
+  && dpkg -i /tmp/wkhtmltopdf.deb \
+  && rm -f /tmp/wkhtmltopdf.deb; \
+fi \
  \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-&& rm -rf /var/lib/apt/lists/* \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+  && rm -rf /var/lib/apt/lists/*; \
+fi \
  \
 	\
 # -------------------- wpcli --------------------
 	&& curl -sS -L --fail https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
 	\
-# -------------------- cleanup --------------------
-	&& rm -rf /home/${MY_USER}/.*json \
-&& rm -rf /home/${MY_USER}/.cache \
-&& rm -rf /home/${MY_USER}/.composer \
-&& rm -rf /home/${MY_USER}/.config \
-&& rm -rf /home/${MY_USER}/.drush \
-&& rm -rf /home/${MY_USER}/.subversion \
-&& rm -rf /home/${MY_USER}/.v8* \
-\
-&& rm -rf /root/.*json \
-&& rm -rf /root/.cache \
-&& rm -rf /root/.composer \
-&& rm -rf /root/.config \
-&& rm -rf /root/.drush \
-&& rm -rf /root/.subversion \
-&& rm -rf /root/.v8* \
-\
-&& rm -rf /tmp/* \
-&& (rm -rf /tmp/.* || true) \
- \
 	\
 	\
-	&& (rm -rf /root/.gem || true ) \
-	&& (rm -rf /root/.cache || true) \
-	&& (rm -rf /root/.composer || true) \
-	&& (rm -rf /root/.config || true) \
-	&& (rm -rf /root/.npm || true) \
-	\
-	&& (rm -rf /home/devilbox/.cache || true) \
-	&& (rm -rf /home/devilbox/.composer || true) \
-	&& (rm -rf /home/devilbox/.config || true) \
-	&& (rm -rf /home/devilbox/.npm || true) \
-	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
 	&& (rm -rf /usr/local/src/composer/cache/* || true) \
-	&& rm -rf /tmp/* \
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 
@@ -423,12 +436,47 @@ RUN set -eux \
 	&& COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-1 global require  hirak/prestissimo \
 	\
 	\
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -478,17 +526,52 @@ RUN set -eux \
 	&& su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \
 	\
 	\
-	&& ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
 	\
-	&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
-	&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox \
-	&& rm -rf /home/devilbox/.npm \
-	&& rm -rf /home/devilbox/.cache \
-	&& rm -rf /home/devilbox/.config \
-	&& rm -rf /tmp/* \
+	&& if [ -f "/opt/nvm/nvm.sh" ]; then \
+		ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
+		\
+		&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
+		&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox; \
+	fi \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -505,22 +588,53 @@ RUN set -eux \
 	&& gem install mdl -v 0.5.0 \
 	\
 	\
-	&& rm -rf /root/.gem \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
 ### Install pip (Python) packages
 ###
 RUN set -eux \
-# -------------------- ansible --------------------
-	&& pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \
-	\
 # -------------------- yamllint --------------------
 	&& pip install --no-cache-dir --force-reinstall yamllint || true \
 	\
@@ -528,13 +642,47 @@ RUN set -eux \
 	&& pip install --no-cache-dir --force-reinstall yq || true \
 	\
 	\
-	&& rm -rf /root/.cache/pip \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -581,8 +729,26 @@ RUN set -eux \
 
 RUN set -eux \
 # -------------------- Software --------------------
-	&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \
+	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
+	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+&& su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '7.1' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '7.1' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
+ \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
@@ -597,8 +763,8 @@ RUN set -eux \
 	&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
 	&& phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \
 	&& phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' \
-	&& symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \
-	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" \
+	&& symfony -V | grep -Ei 'version\s[0-9][.0-9]+' \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)"; fi \
 	&& wp --allow-root --version | grep -E '[0-9][.0-9]+' \
 	\
 # -------------------- Composer --------------------
@@ -607,7 +773,6 @@ RUN set -eux \
 	&& lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[0-9][.0-9]+$' \
 	\
 # -------------------- PIP --------------------
-	&& ansible --version | grep -E '^ansible [0-9][.0-9]+$' \
 	&& yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \
 	&& yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \
 	\
@@ -628,14 +793,42 @@ RUN set -eux \
 	&& mdl --version | grep -E '[0-9][.0-9]+' \
 	\
 # -------------------- Cleanup --------------------
-	&& rm -rf /home/devilbox/.cache/ \
-	&& rm -rf /home/devilbox/.config/ \
-	&& rm -rf /root/.ansible \
-	&& rm -rf /root/.console \
-	&& rm -rf /root/.composer \
-	&& rm -rf /root/.drush \
-	&& rm -rf /root/.pm2 \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 

Dockerfiles/work/Dockerfile-7.2

@@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
@@ -56,20 +55,12 @@ RUN set -eux \
 		gnupg \
 		\
 	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \
-	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo "deb http://ftp.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 \
-	&& echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -105,7 +96,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mariadb-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -114,7 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -132,30 +124,14 @@ RUN set -eux \
 		wget \
 		whois \
 		xz-utils \
-		yarn \
 		zip \
 		zlib1g-dev \
 		zsh \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-RUN set -eux \
-	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-		DEBIAN_FRONTEND=noninteractive apt-get update -q \
-		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
-			mongodb-org-shell \
-			mongodb-org-tools; \
-	fi \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -163,11 +139,15 @@ RUN set -eux \
 ###
 RUN set -eux \
 # -------------------- composer --------------------
-	&& curl -sS -L --fail https://getcomposer.org/composer-1.phar > /usr/local/bin/composer-1 \
-&& curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
+	&& COMPOSER_1_VERSION="latest-1.x" \
+&& COMPOSER_2_VERSION="latest-2.x" \
+ \
+	&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \
+&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \
 && chmod +x /usr/local/bin/composer-1 \
 && chmod +x /usr/local/bin/composer-2 \
-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+ \
+	&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
  \
 	\
 # -------------------- pip --------------------
@@ -181,9 +161,18 @@ RUN set -eux \
  \
 	\
 # -------------------- nvm --------------------
-	&& git clone https://github.com/creationix/nvm /opt/nvm \
-&& cd /opt/nvm \
-&& git checkout "$(git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1))" \
+	&& NODE_VERSION="--lts" \
+ \
+	&& NVM_VERSION="$( \
+  curl -sS 'https://github.com/nvm-sh/nvm/releases' \
+  | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
+  | grep -Eo 'v?[.0-9]+' \
+  | sort -V \
+  | tail -1 \
+)" \
+&& mkdir -p /opt/nvm \
+&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
+  | NVM_DIR="/opt/nvm" bash \
 \
 && { \
   echo 'export NVM_DIR="/opt/nvm"'; \
@@ -191,13 +180,38 @@ RUN set -eux \
   echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion'; \
 } >> /home/devilbox/.bashrc \
 \
-&& chown -R devilbox:devilbox /opt/nvm \
+&& chown -R devilbox:devilbox "/opt/nvm" \
  \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm install node' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \
+	&& su  -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
+\
+&& chmod 0777 /opt/nvm \
+&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \
+&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+&& echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  postgresql-client \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+&& echo "deb http://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  mongodb-org-tools \
+  mongodb-org-shell \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -255,7 +269,7 @@ RUN set -eux \
  \
 	\
 # -------------------- drupalconsole --------------------
-	&& DURL="https://github.com$(curl -sS 'https://github.com/hechoendrupal/drupal-console-launcher/releases' | grep -Eo 'href="/.+drupal.phar"' | head -1 | sed 's/^href="//g' | sed 's/"$//g')" \
+	&& DURL="$(curl -s https://api.github.com/repos/hechoendrupal/drupal-console-launcher/releases/latest | awk -F\" '/download.*.phar/{print $(NF-1)}' | head -1)" \
 	&& curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \
 	&& chmod +x /usr/local/bin/drupal \
 	\
@@ -266,18 +280,6 @@ RUN set -eux \
 && cd / && rm -rf /tmp/gitflow \
  \
 	\
-# -------------------- homebrew --------------------
-	&& git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \
-&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}"   >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \
-&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \
- \
-	\
 # -------------------- laravel --------------------
 	&& git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \
 && cd /usr/local/src/laravel-installer \
@@ -295,9 +297,11 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
-&& chmod +x mhsendmail_linux_amd64 \
-&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
+  && chmod +x mhsendmail_linux_amd64 \
+  && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \
+fi \
  \
 	\
 # -------------------- mysqldumpsecure --------------------
@@ -364,62 +368,71 @@ RUN set -eux \
  \
 	\
 # -------------------- symfony --------------------
-	&& SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \
-	&& curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \
-	&& chmod +x /usr/local/bin/symfony \
+	&& VERSION="$(curl -s https://api.github.com/repos/symfony-cli/symfony-cli/releases/latest | awk -F\" '/symfony-cli_.*._amd64\.deb/{print $(NF-1)}' | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')" \
+	&& curl -sS -L --fail -o /tmp/symfonycli.deb  https://github.com/symfony-cli/symfony-cli/releases/download/v${VERSION}/symfony-cli_${VERSION}_$(dpkg-architecture --query DEB_HOST_ARCH).deb \
+&& dpkg -i /tmp/symfonycli.deb \
+&& rm -f /tmp/symfonycli.deb \
+ \
 	\
 # -------------------- wkhtmltopdf --------------------
-	&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-  libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
-&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
-&& dpkg -i /tmp/wkhtmltopdf.deb \
-&& rm -f /tmp/wkhtmltopdf.deb \
+	&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases | awk -F\" '/wkhtmltopdf.*.stretch_amd64\.deb/{print $(NF-1)}' | head -1 )" \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+    libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+  && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  ${VERSION} \
+  && dpkg -i /tmp/wkhtmltopdf.deb \
+  && rm -f /tmp/wkhtmltopdf.deb; \
+fi \
  \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-&& rm -rf /var/lib/apt/lists/* \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+  && rm -rf /var/lib/apt/lists/*; \
+fi \
  \
 	\
 # -------------------- wpcli --------------------
 	&& curl -sS -L --fail https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
 	\
-# -------------------- cleanup --------------------
-	&& rm -rf /home/${MY_USER}/.*json \
-&& rm -rf /home/${MY_USER}/.cache \
-&& rm -rf /home/${MY_USER}/.composer \
-&& rm -rf /home/${MY_USER}/.config \
-&& rm -rf /home/${MY_USER}/.drush \
-&& rm -rf /home/${MY_USER}/.subversion \
-&& rm -rf /home/${MY_USER}/.v8* \
-\
-&& rm -rf /root/.*json \
-&& rm -rf /root/.cache \
-&& rm -rf /root/.composer \
-&& rm -rf /root/.config \
-&& rm -rf /root/.drush \
-&& rm -rf /root/.subversion \
-&& rm -rf /root/.v8* \
-\
-&& rm -rf /tmp/* \
-&& (rm -rf /tmp/.* || true) \
- \
 	\
 	\
-	&& (rm -rf /root/.gem || true ) \
-	&& (rm -rf /root/.cache || true) \
-	&& (rm -rf /root/.composer || true) \
-	&& (rm -rf /root/.config || true) \
-	&& (rm -rf /root/.npm || true) \
-	\
-	&& (rm -rf /home/devilbox/.cache || true) \
-	&& (rm -rf /home/devilbox/.composer || true) \
-	&& (rm -rf /home/devilbox/.config || true) \
-	&& (rm -rf /home/devilbox/.npm || true) \
-	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
 	&& (rm -rf /usr/local/src/composer/cache/* || true) \
-	&& rm -rf /tmp/* \
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 
@@ -443,12 +456,47 @@ RUN set -eux \
 	&& COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-1 global require  hirak/prestissimo \
 	\
 	\
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -498,17 +546,52 @@ RUN set -eux \
 	&& su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \
 	\
 	\
-	&& ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
 	\
-	&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
-	&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox \
-	&& rm -rf /home/devilbox/.npm \
-	&& rm -rf /home/devilbox/.cache \
-	&& rm -rf /home/devilbox/.config \
-	&& rm -rf /tmp/* \
+	&& if [ -f "/opt/nvm/nvm.sh" ]; then \
+		ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
+		\
+		&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
+		&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox; \
+	fi \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -525,22 +608,53 @@ RUN set -eux \
 	&& gem install mdl -v 0.5.0 \
 	\
 	\
-	&& rm -rf /root/.gem \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
 ### Install pip (Python) packages
 ###
 RUN set -eux \
-# -------------------- ansible --------------------
-	&& pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \
-	\
 # -------------------- yamllint --------------------
 	&& pip install --no-cache-dir --force-reinstall yamllint || true \
 	\
@@ -548,13 +662,47 @@ RUN set -eux \
 	&& pip install --no-cache-dir --force-reinstall yq || true \
 	\
 	\
-	&& rm -rf /root/.cache/pip \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -601,8 +749,26 @@ RUN set -eux \
 
 RUN set -eux \
 # -------------------- Software --------------------
-	&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \
+	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
+	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+&& su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '7.2' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '7.2' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
+ \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
@@ -619,8 +785,8 @@ RUN set -eux \
 	&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
 	&& phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \
 	&& phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' \
-	&& symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \
-	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" \
+	&& symfony -V | grep -Ei 'version\s[0-9][.0-9]+' \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)"; fi \
 	&& wp --allow-root --version | grep -E '[0-9][.0-9]+' \
 	\
 # -------------------- Composer --------------------
@@ -629,7 +795,6 @@ RUN set -eux \
 	&& lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[0-9][.0-9]+$' \
 	\
 # -------------------- PIP --------------------
-	&& ansible --version | grep -E '^ansible [0-9][.0-9]+$' \
 	&& yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \
 	&& yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \
 	\
@@ -650,14 +815,42 @@ RUN set -eux \
 	&& mdl --version | grep -E '[0-9][.0-9]+' \
 	\
 # -------------------- Cleanup --------------------
-	&& rm -rf /home/devilbox/.cache/ \
-	&& rm -rf /home/devilbox/.config/ \
-	&& rm -rf /root/.ansible \
-	&& rm -rf /root/.console \
-	&& rm -rf /root/.composer \
-	&& rm -rf /root/.drush \
-	&& rm -rf /root/.pm2 \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 

Dockerfiles/work/Dockerfile-7.3

@@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
@@ -56,20 +55,12 @@ RUN set -eux \
 		gnupg \
 		\
 	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \
-	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo "deb http://ftp.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 \
-	&& echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -105,7 +96,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mariadb-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -114,7 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -132,30 +124,14 @@ RUN set -eux \
 		wget \
 		whois \
 		xz-utils \
-		yarn \
 		zip \
 		zlib1g-dev \
 		zsh \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-RUN set -eux \
-	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-		DEBIAN_FRONTEND=noninteractive apt-get update -q \
-		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
-			mongodb-org-shell \
-			mongodb-org-tools; \
-	fi \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -163,11 +139,15 @@ RUN set -eux \
 ###
 RUN set -eux \
 # -------------------- composer --------------------
-	&& curl -sS -L --fail https://getcomposer.org/composer-1.phar > /usr/local/bin/composer-1 \
-&& curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
+	&& COMPOSER_1_VERSION="latest-1.x" \
+&& COMPOSER_2_VERSION="latest-2.x" \
+ \
+	&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \
+&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \
 && chmod +x /usr/local/bin/composer-1 \
 && chmod +x /usr/local/bin/composer-2 \
-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+ \
+	&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
  \
 	\
 # -------------------- pip --------------------
@@ -182,9 +162,18 @@ RUN set -eux \
  \
 	\
 # -------------------- nvm --------------------
-	&& git clone https://github.com/creationix/nvm /opt/nvm \
-&& cd /opt/nvm \
-&& git checkout "$(git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1))" \
+	&& NODE_VERSION="--lts" \
+ \
+	&& NVM_VERSION="$( \
+  curl -sS 'https://github.com/nvm-sh/nvm/releases' \
+  | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
+  | grep -Eo 'v?[.0-9]+' \
+  | sort -V \
+  | tail -1 \
+)" \
+&& mkdir -p /opt/nvm \
+&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
+  | NVM_DIR="/opt/nvm" bash \
 \
 && { \
   echo 'export NVM_DIR="/opt/nvm"'; \
@@ -192,13 +181,38 @@ RUN set -eux \
   echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion'; \
 } >> /home/devilbox/.bashrc \
 \
-&& chown -R devilbox:devilbox /opt/nvm \
+&& chown -R devilbox:devilbox "/opt/nvm" \
  \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm install node' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \
+	&& su  -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
+\
+&& chmod 0777 /opt/nvm \
+&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \
+&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  postgresql-client \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  mongodb-org-tools \
+  mongodb-org-shell \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -256,7 +270,7 @@ RUN set -eux \
  \
 	\
 # -------------------- drupalconsole --------------------
-	&& DURL="https://github.com$(curl -sS 'https://github.com/hechoendrupal/drupal-console-launcher/releases' | grep -Eo 'href="/.+drupal.phar"' | head -1 | sed 's/^href="//g' | sed 's/"$//g')" \
+	&& DURL="$(curl -s https://api.github.com/repos/hechoendrupal/drupal-console-launcher/releases/latest | awk -F\" '/download.*.phar/{print $(NF-1)}' | head -1)" \
 	&& curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \
 	&& chmod +x /usr/local/bin/drupal \
 	\
@@ -267,18 +281,6 @@ RUN set -eux \
 && cd / && rm -rf /tmp/gitflow \
  \
 	\
-# -------------------- homebrew --------------------
-	&& git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \
-&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}"   >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \
-&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \
- \
-	\
 # -------------------- laravel --------------------
 	&& git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \
 && cd /usr/local/src/laravel-installer \
@@ -296,9 +298,11 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
-&& chmod +x mhsendmail_linux_amd64 \
-&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
+  && chmod +x mhsendmail_linux_amd64 \
+  && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \
+fi \
  \
 	\
 # -------------------- mysqldumpsecure --------------------
@@ -365,62 +369,71 @@ RUN set -eux \
  \
 	\
 # -------------------- symfony --------------------
-	&& SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \
-	&& curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \
-	&& chmod +x /usr/local/bin/symfony \
+	&& VERSION="$(curl -s https://api.github.com/repos/symfony-cli/symfony-cli/releases/latest | awk -F\" '/symfony-cli_.*._amd64\.deb/{print $(NF-1)}' | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')" \
+	&& curl -sS -L --fail -o /tmp/symfonycli.deb  https://github.com/symfony-cli/symfony-cli/releases/download/v${VERSION}/symfony-cli_${VERSION}_$(dpkg-architecture --query DEB_HOST_ARCH).deb \
+&& dpkg -i /tmp/symfonycli.deb \
+&& rm -f /tmp/symfonycli.deb \
+ \
 	\
 # -------------------- wkhtmltopdf --------------------
-	&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-  libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
-&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
-&& dpkg -i /tmp/wkhtmltopdf.deb \
-&& rm -f /tmp/wkhtmltopdf.deb \
+	&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases | awk -F\" '/wkhtmltopdf.*.stretch_amd64\.deb/{print $(NF-1)}' | head -1 )" \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+    libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+  && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  ${VERSION} \
+  && dpkg -i /tmp/wkhtmltopdf.deb \
+  && rm -f /tmp/wkhtmltopdf.deb; \
+fi \
  \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-&& rm -rf /var/lib/apt/lists/* \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+  && rm -rf /var/lib/apt/lists/*; \
+fi \
  \
 	\
 # -------------------- wpcli --------------------
 	&& curl -sS -L --fail https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
 	\
-# -------------------- cleanup --------------------
-	&& rm -rf /home/${MY_USER}/.*json \
-&& rm -rf /home/${MY_USER}/.cache \
-&& rm -rf /home/${MY_USER}/.composer \
-&& rm -rf /home/${MY_USER}/.config \
-&& rm -rf /home/${MY_USER}/.drush \
-&& rm -rf /home/${MY_USER}/.subversion \
-&& rm -rf /home/${MY_USER}/.v8* \
-\
-&& rm -rf /root/.*json \
-&& rm -rf /root/.cache \
-&& rm -rf /root/.composer \
-&& rm -rf /root/.config \
-&& rm -rf /root/.drush \
-&& rm -rf /root/.subversion \
-&& rm -rf /root/.v8* \
-\
-&& rm -rf /tmp/* \
-&& (rm -rf /tmp/.* || true) \
- \
 	\
 	\
-	&& (rm -rf /root/.gem || true ) \
-	&& (rm -rf /root/.cache || true) \
-	&& (rm -rf /root/.composer || true) \
-	&& (rm -rf /root/.config || true) \
-	&& (rm -rf /root/.npm || true) \
-	\
-	&& (rm -rf /home/devilbox/.cache || true) \
-	&& (rm -rf /home/devilbox/.composer || true) \
-	&& (rm -rf /home/devilbox/.config || true) \
-	&& (rm -rf /home/devilbox/.npm || true) \
-	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
 	&& (rm -rf /usr/local/src/composer/cache/* || true) \
-	&& rm -rf /tmp/* \
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 
@@ -444,12 +457,47 @@ RUN set -eux \
 	&& COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-1 global require  hirak/prestissimo \
 	\
 	\
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -499,17 +547,52 @@ RUN set -eux \
 	&& su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \
 	\
 	\
-	&& ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
 	\
-	&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
-	&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox \
-	&& rm -rf /home/devilbox/.npm \
-	&& rm -rf /home/devilbox/.cache \
-	&& rm -rf /home/devilbox/.config \
-	&& rm -rf /tmp/* \
+	&& if [ -f "/opt/nvm/nvm.sh" ]; then \
+		ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
+		\
+		&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
+		&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox; \
+	fi \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -526,22 +609,53 @@ RUN set -eux \
 	&& gem install mdl -v 0.5.0 \
 	\
 	\
-	&& rm -rf /root/.gem \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
 ### Install pip (Python) packages
 ###
 RUN set -eux \
-# -------------------- ansible --------------------
-	&& pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \
-	\
 # -------------------- yamllint --------------------
 	&& pip install --no-cache-dir --force-reinstall yamllint || true \
 	\
@@ -549,13 +663,47 @@ RUN set -eux \
 	&& pip install --no-cache-dir --force-reinstall yq || true \
 	\
 	\
-	&& rm -rf /root/.cache/pip \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -602,8 +750,26 @@ RUN set -eux \
 
 RUN set -eux \
 # -------------------- Software --------------------
-	&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \
+	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
+	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+&& su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '7.3' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '7.3' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
+ \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
@@ -620,8 +786,8 @@ RUN set -eux \
 	&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
 	&& phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \
 	&& phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' \
-	&& symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \
-	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" \
+	&& symfony -V | grep -Ei 'version\s[0-9][.0-9]+' \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)"; fi \
 	&& wp --allow-root --version | grep -E '[0-9][.0-9]+' \
 	\
 # -------------------- Composer --------------------
@@ -630,7 +796,6 @@ RUN set -eux \
 	&& lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[0-9][.0-9]+$' \
 	\
 # -------------------- PIP --------------------
-	&& ansible --version | grep -E '^ansible [0-9][.0-9]+$' \
 	&& yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \
 	&& yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \
 	\
@@ -651,14 +816,42 @@ RUN set -eux \
 	&& mdl --version | grep -E '[0-9][.0-9]+' \
 	\
 # -------------------- Cleanup --------------------
-	&& rm -rf /home/devilbox/.cache/ \
-	&& rm -rf /home/devilbox/.config/ \
-	&& rm -rf /root/.ansible \
-	&& rm -rf /root/.console \
-	&& rm -rf /root/.composer \
-	&& rm -rf /root/.drush \
-	&& rm -rf /root/.pm2 \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 

Dockerfiles/work/Dockerfile-7.4

@@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
@@ -56,20 +55,12 @@ RUN set -eux \
 		gnupg \
 		\
 	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \
-	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo "deb http://ftp.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 \
-	&& echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -105,7 +96,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mariadb-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -114,7 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -132,30 +124,14 @@ RUN set -eux \
 		wget \
 		whois \
 		xz-utils \
-		yarn \
 		zip \
 		zlib1g-dev \
 		zsh \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-RUN set -eux \
-	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-		DEBIAN_FRONTEND=noninteractive apt-get update -q \
-		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
-			mongodb-org-shell \
-			mongodb-org-tools; \
-	fi \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -163,11 +139,15 @@ RUN set -eux \
 ###
 RUN set -eux \
 # -------------------- composer --------------------
-	&& curl -sS -L --fail https://getcomposer.org/composer-1.phar > /usr/local/bin/composer-1 \
-&& curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
+	&& COMPOSER_1_VERSION="latest-1.x" \
+&& COMPOSER_2_VERSION="latest-2.x" \
+ \
+	&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \
+&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \
 && chmod +x /usr/local/bin/composer-1 \
 && chmod +x /usr/local/bin/composer-2 \
-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+ \
+	&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
  \
 	\
 # -------------------- pip --------------------
@@ -182,9 +162,18 @@ RUN set -eux \
  \
 	\
 # -------------------- nvm --------------------
-	&& git clone https://github.com/creationix/nvm /opt/nvm \
-&& cd /opt/nvm \
-&& git checkout "$(git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1))" \
+	&& NODE_VERSION="--lts" \
+ \
+	&& NVM_VERSION="$( \
+  curl -sS 'https://github.com/nvm-sh/nvm/releases' \
+  | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
+  | grep -Eo 'v?[.0-9]+' \
+  | sort -V \
+  | tail -1 \
+)" \
+&& mkdir -p /opt/nvm \
+&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
+  | NVM_DIR="/opt/nvm" bash \
 \
 && { \
   echo 'export NVM_DIR="/opt/nvm"'; \
@@ -192,13 +181,38 @@ RUN set -eux \
   echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion'; \
 } >> /home/devilbox/.bashrc \
 \
-&& chown -R devilbox:devilbox /opt/nvm \
+&& chown -R devilbox:devilbox "/opt/nvm" \
  \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm install node' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \
+	&& su  -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
+\
+&& chmod 0777 /opt/nvm \
+&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \
+&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  postgresql-client \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  mongodb-org-tools \
+  mongodb-org-shell \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -256,7 +270,7 @@ RUN set -eux \
  \
 	\
 # -------------------- drupalconsole --------------------
-	&& DURL="https://github.com$(curl -sS 'https://github.com/hechoendrupal/drupal-console-launcher/releases' | grep -Eo 'href="/.+drupal.phar"' | head -1 | sed 's/^href="//g' | sed 's/"$//g')" \
+	&& DURL="$(curl -s https://api.github.com/repos/hechoendrupal/drupal-console-launcher/releases/latest | awk -F\" '/download.*.phar/{print $(NF-1)}' | head -1)" \
 	&& curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \
 	&& chmod +x /usr/local/bin/drupal \
 	\
@@ -267,18 +281,6 @@ RUN set -eux \
 && cd / && rm -rf /tmp/gitflow \
  \
 	\
-# -------------------- homebrew --------------------
-	&& git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \
-&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}"   >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \
-&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \
- \
-	\
 # -------------------- laravel --------------------
 	&& git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \
 && cd /usr/local/src/laravel-installer \
@@ -296,9 +298,11 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
-&& chmod +x mhsendmail_linux_amd64 \
-&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
+  && chmod +x mhsendmail_linux_amd64 \
+  && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \
+fi \
  \
 	\
 # -------------------- mysqldumpsecure --------------------
@@ -324,20 +328,6 @@ RUN set -eux \
 && rm -rf /usr/local/src/mysqldump-secure \
  \
 	\
-# -------------------- phalcon --------------------
-	&& git clone https://github.com/phalcon/phalcon-devtools /usr/local/src/phalcon-devtools \
-&& cd /usr/local/src/phalcon-devtools \
-&& git checkout $(git describe --abbrev=0 --tags) \
-&& COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer install \
- \
-	&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/phalcon-devtools \
-&& su - ${MY_USER} -c 'cd /usr/local/src/phalcon-devtools && ./phalcon.sh' \
-&& ln -sf /usr/local/src/phalcon-devtools/phalcon /usr/local/bin/phalcon \
-&& chmod +x phalcon \
-&& cd / \
-&& rm -rf /usr/local/src/phalcon-devtools/.git \
- \
-	\
 # -------------------- phpcs --------------------
 	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs \
 && chmod +x /usr/local/bin/phpcs \
@@ -365,62 +355,71 @@ RUN set -eux \
  \
 	\
 # -------------------- symfony --------------------
-	&& SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \
-	&& curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \
-	&& chmod +x /usr/local/bin/symfony \
+	&& VERSION="$(curl -s https://api.github.com/repos/symfony-cli/symfony-cli/releases/latest | awk -F\" '/symfony-cli_.*._amd64\.deb/{print $(NF-1)}' | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')" \
+	&& curl -sS -L --fail -o /tmp/symfonycli.deb  https://github.com/symfony-cli/symfony-cli/releases/download/v${VERSION}/symfony-cli_${VERSION}_$(dpkg-architecture --query DEB_HOST_ARCH).deb \
+&& dpkg -i /tmp/symfonycli.deb \
+&& rm -f /tmp/symfonycli.deb \
+ \
 	\
 # -------------------- wkhtmltopdf --------------------
-	&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-  libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
-&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
-&& dpkg -i /tmp/wkhtmltopdf.deb \
-&& rm -f /tmp/wkhtmltopdf.deb \
+	&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases | awk -F\" '/wkhtmltopdf.*.stretch_amd64\.deb/{print $(NF-1)}' | head -1 )" \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+    libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+  && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  ${VERSION} \
+  && dpkg -i /tmp/wkhtmltopdf.deb \
+  && rm -f /tmp/wkhtmltopdf.deb; \
+fi \
  \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-&& rm -rf /var/lib/apt/lists/* \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+  && rm -rf /var/lib/apt/lists/*; \
+fi \
  \
 	\
 # -------------------- wpcli --------------------
 	&& curl -sS -L --fail https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
 	\
-# -------------------- cleanup --------------------
-	&& rm -rf /home/${MY_USER}/.*json \
-&& rm -rf /home/${MY_USER}/.cache \
-&& rm -rf /home/${MY_USER}/.composer \
-&& rm -rf /home/${MY_USER}/.config \
-&& rm -rf /home/${MY_USER}/.drush \
-&& rm -rf /home/${MY_USER}/.subversion \
-&& rm -rf /home/${MY_USER}/.v8* \
-\
-&& rm -rf /root/.*json \
-&& rm -rf /root/.cache \
-&& rm -rf /root/.composer \
-&& rm -rf /root/.config \
-&& rm -rf /root/.drush \
-&& rm -rf /root/.subversion \
-&& rm -rf /root/.v8* \
-\
-&& rm -rf /tmp/* \
-&& (rm -rf /tmp/.* || true) \
- \
 	\
 	\
-	&& (rm -rf /root/.gem || true ) \
-	&& (rm -rf /root/.cache || true) \
-	&& (rm -rf /root/.composer || true) \
-	&& (rm -rf /root/.config || true) \
-	&& (rm -rf /root/.npm || true) \
-	\
-	&& (rm -rf /home/devilbox/.cache || true) \
-	&& (rm -rf /home/devilbox/.composer || true) \
-	&& (rm -rf /home/devilbox/.config || true) \
-	&& (rm -rf /home/devilbox/.npm || true) \
-	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
 	&& (rm -rf /usr/local/src/composer/cache/* || true) \
-	&& rm -rf /tmp/* \
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 
@@ -444,12 +443,47 @@ RUN set -eux \
 	&& COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-1 global require  hirak/prestissimo \
 	\
 	\
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -499,17 +533,52 @@ RUN set -eux \
 	&& su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \
 	\
 	\
-	&& ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
 	\
-	&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
-	&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox \
-	&& rm -rf /home/devilbox/.npm \
-	&& rm -rf /home/devilbox/.cache \
-	&& rm -rf /home/devilbox/.config \
-	&& rm -rf /tmp/* \
+	&& if [ -f "/opt/nvm/nvm.sh" ]; then \
+		ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
+		\
+		&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
+		&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox; \
+	fi \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -526,22 +595,53 @@ RUN set -eux \
 	&& gem install mdl -v 0.5.0 \
 	\
 	\
-	&& rm -rf /root/.gem \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
 ### Install pip (Python) packages
 ###
 RUN set -eux \
-# -------------------- ansible --------------------
-	&& pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \
-	\
 # -------------------- yamllint --------------------
 	&& pip install --no-cache-dir --force-reinstall yamllint || true \
 	\
@@ -549,13 +649,47 @@ RUN set -eux \
 	&& pip install --no-cache-dir --force-reinstall yq || true \
 	\
 	\
-	&& rm -rf /root/.cache/pip \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -602,8 +736,26 @@ RUN set -eux \
 
 RUN set -eux \
 # -------------------- Software --------------------
-	&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \
+	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
+	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+&& su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '7.4' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '7.4' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
+ \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
@@ -614,14 +766,13 @@ RUN set -eux \
 	&& laravel --version | grep -E '(Installer|version)\s*[0-9][.0-9]+' \
 	&& linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' \
 	&& mysqldump-secure --version | grep -E 'Version:\s*[0-9][.0-9]+' \
-	&& phalcon commands | grep -E '[0-9][.0-9]+' \
 	&& phpcs --version | grep -E 'version [0-9][.0-9]+' \
 	&& phpcbf --version | grep -E 'version [0-9][.0-9]+' \
 	&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
 	&& phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \
 	&& phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' \
-	&& symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \
-	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" \
+	&& symfony -V | grep -Ei 'version\s[0-9][.0-9]+' \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)"; fi \
 	&& wp --allow-root --version | grep -E '[0-9][.0-9]+' \
 	\
 # -------------------- Composer --------------------
@@ -630,7 +781,6 @@ RUN set -eux \
 	&& lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[0-9][.0-9]+$' \
 	\
 # -------------------- PIP --------------------
-	&& ansible --version | grep -E '^ansible [0-9][.0-9]+$' \
 	&& yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \
 	&& yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \
 	\
@@ -651,14 +801,42 @@ RUN set -eux \
 	&& mdl --version | grep -E '[0-9][.0-9]+' \
 	\
 # -------------------- Cleanup --------------------
-	&& rm -rf /home/devilbox/.cache/ \
-	&& rm -rf /home/devilbox/.config/ \
-	&& rm -rf /root/.ansible \
-	&& rm -rf /root/.console \
-	&& rm -rf /root/.composer \
-	&& rm -rf /root/.drush \
-	&& rm -rf /root/.pm2 \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 

Dockerfiles/work/Dockerfile-8.0

@@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
@@ -56,20 +55,12 @@ RUN set -eux \
 		gnupg \
 		\
 	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \
-	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo "deb http://ftp.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 \
-	&& echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -105,7 +96,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mariadb-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -114,7 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -132,30 +124,14 @@ RUN set -eux \
 		wget \
 		whois \
 		xz-utils \
-		yarn \
 		zip \
 		zlib1g-dev \
 		zsh \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-RUN set -eux \
-	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-		DEBIAN_FRONTEND=noninteractive apt-get update -q \
-		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
-			mongodb-org-shell \
-			mongodb-org-tools; \
-	fi \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -163,11 +139,15 @@ RUN set -eux \
 ###
 RUN set -eux \
 # -------------------- composer --------------------
-	&& curl -sS -L --fail https://getcomposer.org/composer-1.phar > /usr/local/bin/composer-1 \
-&& curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
+	&& COMPOSER_1_VERSION="latest-1.x" \
+&& COMPOSER_2_VERSION="latest-2.x" \
+ \
+	&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \
+&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \
 && chmod +x /usr/local/bin/composer-1 \
 && chmod +x /usr/local/bin/composer-2 \
-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+ \
+	&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
  \
 	\
 # -------------------- pip --------------------
@@ -182,9 +162,18 @@ RUN set -eux \
  \
 	\
 # -------------------- nvm --------------------
-	&& git clone https://github.com/creationix/nvm /opt/nvm \
-&& cd /opt/nvm \
-&& git checkout "$(git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1))" \
+	&& NODE_VERSION="--lts" \
+ \
+	&& NVM_VERSION="$( \
+  curl -sS 'https://github.com/nvm-sh/nvm/releases' \
+  | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
+  | grep -Eo 'v?[.0-9]+' \
+  | sort -V \
+  | tail -1 \
+)" \
+&& mkdir -p /opt/nvm \
+&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
+  | NVM_DIR="/opt/nvm" bash \
 \
 && { \
   echo 'export NVM_DIR="/opt/nvm"'; \
@@ -192,13 +181,38 @@ RUN set -eux \
   echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion'; \
 } >> /home/devilbox/.bashrc \
 \
-&& chown -R devilbox:devilbox /opt/nvm \
+&& chown -R devilbox:devilbox "/opt/nvm" \
  \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm install node' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \
+	&& su  -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
+\
+&& chmod 0777 /opt/nvm \
+&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \
+&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  postgresql-client \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  mongodb-org-tools \
+  mongodb-org-shell \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -220,18 +234,6 @@ RUN set -eux \
 && cd / && rm -rf /tmp/gitflow \
  \
 	\
-# -------------------- homebrew --------------------
-	&& git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \
-&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}"   >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \
-&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \
- \
-	\
 # -------------------- laravel --------------------
 	&& git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \
 && cd /usr/local/src/laravel-installer \
@@ -249,9 +251,11 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
-&& chmod +x mhsendmail_linux_amd64 \
-&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
+  && chmod +x mhsendmail_linux_amd64 \
+  && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \
+fi \
  \
 	\
 # -------------------- mysqldumpsecure --------------------
@@ -299,62 +303,71 @@ RUN set -eux \
  \
 	\
 # -------------------- symfony --------------------
-	&& SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \
-	&& curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \
-	&& chmod +x /usr/local/bin/symfony \
+	&& VERSION="$(curl -s https://api.github.com/repos/symfony-cli/symfony-cli/releases/latest | awk -F\" '/symfony-cli_.*._amd64\.deb/{print $(NF-1)}' | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')" \
+	&& curl -sS -L --fail -o /tmp/symfonycli.deb  https://github.com/symfony-cli/symfony-cli/releases/download/v${VERSION}/symfony-cli_${VERSION}_$(dpkg-architecture --query DEB_HOST_ARCH).deb \
+&& dpkg -i /tmp/symfonycli.deb \
+&& rm -f /tmp/symfonycli.deb \
+ \
 	\
 # -------------------- wkhtmltopdf --------------------
-	&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-  libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
-&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
-&& dpkg -i /tmp/wkhtmltopdf.deb \
-&& rm -f /tmp/wkhtmltopdf.deb \
+	&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases | awk -F\" '/wkhtmltopdf.*.stretch_amd64\.deb/{print $(NF-1)}' | head -1 )" \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+    libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+  && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  ${VERSION} \
+  && dpkg -i /tmp/wkhtmltopdf.deb \
+  && rm -f /tmp/wkhtmltopdf.deb; \
+fi \
  \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-&& rm -rf /var/lib/apt/lists/* \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+  && rm -rf /var/lib/apt/lists/*; \
+fi \
  \
 	\
 # -------------------- wpcli --------------------
 	&& curl -sS -L --fail https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
 	\
-# -------------------- cleanup --------------------
-	&& rm -rf /home/${MY_USER}/.*json \
-&& rm -rf /home/${MY_USER}/.cache \
-&& rm -rf /home/${MY_USER}/.composer \
-&& rm -rf /home/${MY_USER}/.config \
-&& rm -rf /home/${MY_USER}/.drush \
-&& rm -rf /home/${MY_USER}/.subversion \
-&& rm -rf /home/${MY_USER}/.v8* \
-\
-&& rm -rf /root/.*json \
-&& rm -rf /root/.cache \
-&& rm -rf /root/.composer \
-&& rm -rf /root/.config \
-&& rm -rf /root/.drush \
-&& rm -rf /root/.subversion \
-&& rm -rf /root/.v8* \
-\
-&& rm -rf /tmp/* \
-&& (rm -rf /tmp/.* || true) \
- \
 	\
 	\
-	&& (rm -rf /root/.gem || true ) \
-	&& (rm -rf /root/.cache || true) \
-	&& (rm -rf /root/.composer || true) \
-	&& (rm -rf /root/.config || true) \
-	&& (rm -rf /root/.npm || true) \
-	\
-	&& (rm -rf /home/devilbox/.cache || true) \
-	&& (rm -rf /home/devilbox/.composer || true) \
-	&& (rm -rf /home/devilbox/.config || true) \
-	&& (rm -rf /home/devilbox/.npm || true) \
-	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
 	&& (rm -rf /usr/local/src/composer/cache/* || true) \
-	&& rm -rf /tmp/* \
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 
@@ -363,12 +376,47 @@ RUN set -eux \
 ###
 RUN set -eux \
 	\
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -418,17 +466,52 @@ RUN set -eux \
 	&& su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \
 	\
 	\
-	&& ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
 	\
-	&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
-	&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox \
-	&& rm -rf /home/devilbox/.npm \
-	&& rm -rf /home/devilbox/.cache \
-	&& rm -rf /home/devilbox/.config \
-	&& rm -rf /tmp/* \
+	&& if [ -f "/opt/nvm/nvm.sh" ]; then \
+		ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
+		\
+		&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
+		&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox; \
+	fi \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -445,22 +528,53 @@ RUN set -eux \
 	&& gem install mdl -v 0.5.0 \
 	\
 	\
-	&& rm -rf /root/.gem \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
 ### Install pip (Python) packages
 ###
 RUN set -eux \
-# -------------------- ansible --------------------
-	&& pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \
-	\
 # -------------------- yamllint --------------------
 	&& pip install --no-cache-dir --force-reinstall yamllint || true \
 	\
@@ -468,13 +582,47 @@ RUN set -eux \
 	&& pip install --no-cache-dir --force-reinstall yq || true \
 	\
 	\
-	&& rm -rf /root/.cache/pip \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -521,8 +669,26 @@ RUN set -eux \
 
 RUN set -eux \
 # -------------------- Software --------------------
-	&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \
+	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
+	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+&& su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '8.0' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '8.0' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
+ \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
 	&& git-flow version | grep -E '[0-9][.0-9]+' \
@@ -533,14 +699,13 @@ RUN set -eux \
 	&& phpcbf --version | grep -E 'version [0-9][.0-9]+' \
 	&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
 	&& phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \
-	&& symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \
-	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" \
+	&& symfony -V | grep -Ei 'version\s[0-9][.0-9]+' \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)"; fi \
 	&& wp --allow-root --version | grep -E '[0-9][.0-9]+' \
 	\
 # -------------------- Composer --------------------
 	\
 # -------------------- PIP --------------------
-	&& ansible --version | grep -E '^ansible [0-9][.0-9]+$' \
 	&& yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \
 	&& yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \
 	\
@@ -561,14 +726,42 @@ RUN set -eux \
 	&& mdl --version | grep -E '[0-9][.0-9]+' \
 	\
 # -------------------- Cleanup --------------------
-	&& rm -rf /home/devilbox/.cache/ \
-	&& rm -rf /home/devilbox/.config/ \
-	&& rm -rf /root/.ansible \
-	&& rm -rf /root/.console \
-	&& rm -rf /root/.composer \
-	&& rm -rf /root/.drush \
-	&& rm -rf /root/.pm2 \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 

Dockerfiles/work/Dockerfile-8.1

@@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
@@ -56,20 +55,12 @@ RUN set -eux \
 		gnupg \
 		\
 	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \
-	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo "deb http://ftp.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 \
-	&& echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -105,7 +96,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mariadb-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -114,7 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -132,30 +124,14 @@ RUN set -eux \
 		wget \
 		whois \
 		xz-utils \
-		yarn \
 		zip \
 		zlib1g-dev \
 		zsh \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-RUN set -eux \
-	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-		DEBIAN_FRONTEND=noninteractive apt-get update -q \
-		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
-			mongodb-org-shell \
-			mongodb-org-tools; \
-	fi \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -163,11 +139,15 @@ RUN set -eux \
 ###
 RUN set -eux \
 # -------------------- composer --------------------
-	&& curl -sS -L --fail https://getcomposer.org/composer-1.phar > /usr/local/bin/composer-1 \
-&& curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
+	&& COMPOSER_1_VERSION="latest-1.x" \
+&& COMPOSER_2_VERSION="latest-2.x" \
+ \
+	&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \
+&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \
 && chmod +x /usr/local/bin/composer-1 \
 && chmod +x /usr/local/bin/composer-2 \
-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+ \
+	&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
  \
 	\
 # -------------------- pip --------------------
@@ -182,9 +162,18 @@ RUN set -eux \
  \
 	\
 # -------------------- nvm --------------------
-	&& git clone https://github.com/creationix/nvm /opt/nvm \
-&& cd /opt/nvm \
-&& git checkout "$(git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1))" \
+	&& NODE_VERSION="--lts" \
+ \
+	&& NVM_VERSION="$( \
+  curl -sS 'https://github.com/nvm-sh/nvm/releases' \
+  | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
+  | grep -Eo 'v?[.0-9]+' \
+  | sort -V \
+  | tail -1 \
+)" \
+&& mkdir -p /opt/nvm \
+&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
+  | NVM_DIR="/opt/nvm" bash \
 \
 && { \
   echo 'export NVM_DIR="/opt/nvm"'; \
@@ -192,13 +181,38 @@ RUN set -eux \
   echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion'; \
 } >> /home/devilbox/.bashrc \
 \
-&& chown -R devilbox:devilbox /opt/nvm \
+&& chown -R devilbox:devilbox "/opt/nvm" \
  \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm install node' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \
+	&& su  -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
+\
+&& chmod 0777 /opt/nvm \
+&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \
+&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  postgresql-client \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  mongodb-org-tools \
+  mongodb-org-shell \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -220,18 +234,6 @@ RUN set -eux \
 && cd / && rm -rf /tmp/gitflow \
  \
 	\
-# -------------------- homebrew --------------------
-	&& git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \
-&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}"   >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \
-&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \
- \
-	\
 # -------------------- laravel --------------------
 	&& git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \
 && cd /usr/local/src/laravel-installer \
@@ -249,9 +251,11 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
-&& chmod +x mhsendmail_linux_amd64 \
-&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
+  && chmod +x mhsendmail_linux_amd64 \
+  && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \
+fi \
  \
 	\
 # -------------------- mysqldumpsecure --------------------
@@ -299,62 +303,71 @@ RUN set -eux \
  \
 	\
 # -------------------- symfony --------------------
-	&& SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \
-	&& curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \
-	&& chmod +x /usr/local/bin/symfony \
+	&& VERSION="$(curl -s https://api.github.com/repos/symfony-cli/symfony-cli/releases/latest | awk -F\" '/symfony-cli_.*._amd64\.deb/{print $(NF-1)}' | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')" \
+	&& curl -sS -L --fail -o /tmp/symfonycli.deb  https://github.com/symfony-cli/symfony-cli/releases/download/v${VERSION}/symfony-cli_${VERSION}_$(dpkg-architecture --query DEB_HOST_ARCH).deb \
+&& dpkg -i /tmp/symfonycli.deb \
+&& rm -f /tmp/symfonycli.deb \
+ \
 	\
 # -------------------- wkhtmltopdf --------------------
-	&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-  libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
-&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
-&& dpkg -i /tmp/wkhtmltopdf.deb \
-&& rm -f /tmp/wkhtmltopdf.deb \
+	&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases | awk -F\" '/wkhtmltopdf.*.stretch_amd64\.deb/{print $(NF-1)}' | head -1 )" \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+    libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+  && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  ${VERSION} \
+  && dpkg -i /tmp/wkhtmltopdf.deb \
+  && rm -f /tmp/wkhtmltopdf.deb; \
+fi \
  \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-&& rm -rf /var/lib/apt/lists/* \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+  && rm -rf /var/lib/apt/lists/*; \
+fi \
  \
 	\
 # -------------------- wpcli --------------------
 	&& curl -sS -L --fail https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
 	\
-# -------------------- cleanup --------------------
-	&& rm -rf /home/${MY_USER}/.*json \
-&& rm -rf /home/${MY_USER}/.cache \
-&& rm -rf /home/${MY_USER}/.composer \
-&& rm -rf /home/${MY_USER}/.config \
-&& rm -rf /home/${MY_USER}/.drush \
-&& rm -rf /home/${MY_USER}/.subversion \
-&& rm -rf /home/${MY_USER}/.v8* \
-\
-&& rm -rf /root/.*json \
-&& rm -rf /root/.cache \
-&& rm -rf /root/.composer \
-&& rm -rf /root/.config \
-&& rm -rf /root/.drush \
-&& rm -rf /root/.subversion \
-&& rm -rf /root/.v8* \
-\
-&& rm -rf /tmp/* \
-&& (rm -rf /tmp/.* || true) \
- \
 	\
 	\
-	&& (rm -rf /root/.gem || true ) \
-	&& (rm -rf /root/.cache || true) \
-	&& (rm -rf /root/.composer || true) \
-	&& (rm -rf /root/.config || true) \
-	&& (rm -rf /root/.npm || true) \
-	\
-	&& (rm -rf /home/devilbox/.cache || true) \
-	&& (rm -rf /home/devilbox/.composer || true) \
-	&& (rm -rf /home/devilbox/.config || true) \
-	&& (rm -rf /home/devilbox/.npm || true) \
-	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
 	&& (rm -rf /usr/local/src/composer/cache/* || true) \
-	&& rm -rf /tmp/* \
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 
@@ -363,12 +376,47 @@ RUN set -eux \
 ###
 RUN set -eux \
 	\
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -418,17 +466,52 @@ RUN set -eux \
 	&& su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \
 	\
 	\
-	&& ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
 	\
-	&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
-	&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox \
-	&& rm -rf /home/devilbox/.npm \
-	&& rm -rf /home/devilbox/.cache \
-	&& rm -rf /home/devilbox/.config \
-	&& rm -rf /tmp/* \
+	&& if [ -f "/opt/nvm/nvm.sh" ]; then \
+		ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
+		\
+		&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
+		&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox; \
+	fi \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -445,22 +528,53 @@ RUN set -eux \
 	&& gem install mdl -v 0.5.0 \
 	\
 	\
-	&& rm -rf /root/.gem \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
 ### Install pip (Python) packages
 ###
 RUN set -eux \
-# -------------------- ansible --------------------
-	&& pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \
-	\
 # -------------------- yamllint --------------------
 	&& pip install --no-cache-dir --force-reinstall yamllint || true \
 	\
@@ -468,13 +582,47 @@ RUN set -eux \
 	&& pip install --no-cache-dir --force-reinstall yq || true \
 	\
 	\
-	&& rm -rf /root/.cache/pip \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -521,8 +669,26 @@ RUN set -eux \
 
 RUN set -eux \
 # -------------------- Software --------------------
-	&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \
+	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
+	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+&& su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '8.1' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '8.1' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
+ \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
 	&& git-flow version | grep -E '[0-9][.0-9]+' \
@@ -533,14 +699,13 @@ RUN set -eux \
 	&& phpcbf --version | grep -E 'version [0-9][.0-9]+' \
 	&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
 	&& phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \
-	&& symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \
-	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" \
+	&& symfony -V | grep -Ei 'version\s[0-9][.0-9]+' \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)"; fi \
 	&& wp --allow-root --version | grep -E '[0-9][.0-9]+' \
 	\
 # -------------------- Composer --------------------
 	\
 # -------------------- PIP --------------------
-	&& ansible --version | grep -E '^ansible [0-9][.0-9]+$' \
 	&& yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \
 	&& yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \
 	\
@@ -561,14 +726,42 @@ RUN set -eux \
 	&& mdl --version | grep -E '[0-9][.0-9]+' \
 	\
 # -------------------- Cleanup --------------------
-	&& rm -rf /home/devilbox/.cache/ \
-	&& rm -rf /home/devilbox/.config/ \
-	&& rm -rf /root/.ansible \
-	&& rm -rf /root/.console \
-	&& rm -rf /root/.composer \
-	&& rm -rf /root/.drush \
-	&& rm -rf /root/.pm2 \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 

Dockerfiles/work/Dockerfile-8.2

@@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
@@ -56,20 +55,12 @@ RUN set -eux \
 		gnupg \
 		\
 	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \
-	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo "deb http://ftp.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 \
-	&& echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -105,7 +96,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mariadb-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -114,7 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -132,30 +124,14 @@ RUN set -eux \
 		wget \
 		whois \
 		xz-utils \
-		yarn \
 		zip \
 		zlib1g-dev \
 		zsh \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-RUN set -eux \
-	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-		DEBIAN_FRONTEND=noninteractive apt-get update -q \
-		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
-			mongodb-org-shell \
-			mongodb-org-tools; \
-	fi \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -163,11 +139,15 @@ RUN set -eux \
 ###
 RUN set -eux \
 # -------------------- composer --------------------
-	&& curl -sS -L --fail https://getcomposer.org/composer-1.phar > /usr/local/bin/composer-1 \
-&& curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
+	&& COMPOSER_1_VERSION="latest-1.x" \
+&& COMPOSER_2_VERSION="latest-2.x" \
+ \
+	&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \
+&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \
 && chmod +x /usr/local/bin/composer-1 \
 && chmod +x /usr/local/bin/composer-2 \
-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+ \
+	&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
  \
 	\
 # -------------------- pip --------------------
@@ -182,9 +162,18 @@ RUN set -eux \
  \
 	\
 # -------------------- nvm --------------------
-	&& git clone https://github.com/creationix/nvm /opt/nvm \
-&& cd /opt/nvm \
-&& git checkout "$(git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1))" \
+	&& NODE_VERSION="--lts" \
+ \
+	&& NVM_VERSION="$( \
+  curl -sS 'https://github.com/nvm-sh/nvm/releases' \
+  | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
+  | grep -Eo 'v?[.0-9]+' \
+  | sort -V \
+  | tail -1 \
+)" \
+&& mkdir -p /opt/nvm \
+&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
+  | NVM_DIR="/opt/nvm" bash \
 \
 && { \
   echo 'export NVM_DIR="/opt/nvm"'; \
@@ -192,13 +181,38 @@ RUN set -eux \
   echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion'; \
 } >> /home/devilbox/.bashrc \
 \
-&& chown -R devilbox:devilbox /opt/nvm \
+&& chown -R devilbox:devilbox "/opt/nvm" \
  \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm install node' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \
+	&& su  -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
+\
+&& chmod 0777 /opt/nvm \
+&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \
+&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  postgresql-client \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  mongodb-org-tools \
+  mongodb-org-shell \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -220,27 +234,17 @@ RUN set -eux \
 && cd / && rm -rf /tmp/gitflow \
  \
 	\
-# -------------------- homebrew --------------------
-	&& git clone https://github.com/Homebrew/brew.git /usr/local/src/brew \
-&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/brew \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "PATH=/usr/local/src/brew/bin:/usr/local/src/brew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export MANPATH=/usr/local/src/brew/manpages:${MANPATH}"   >> /home/devilbox/${v}' \
-&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-'echo "export INFOPATH=/usr/local/src/brew/manpages:${INFOPATH}" >> /home/devilbox/${v}' \
-&& su - ${MY_USER} -c '/usr/local/src/brew/bin/brew config' \
- \
-	\
 # -------------------- linkcheck --------------------
 	&& curl -sS -L --fail https://raw.githubusercontent.com/cytopia/linkcheck/master/linkcheck > /usr/local/bin/linkcheck \
 && chmod +x /usr/local/bin/linkcheck \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
-&& chmod +x mhsendmail_linux_amd64 \
-&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
+  && chmod +x mhsendmail_linux_amd64 \
+  && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \
+fi \
  \
 	\
 # -------------------- mysqldumpsecure --------------------
@@ -283,62 +287,71 @@ RUN set -eux \
  \
 	\
 # -------------------- symfony --------------------
-	&& SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \
-	&& curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \
-	&& chmod +x /usr/local/bin/symfony \
+	&& VERSION="$(curl -s https://api.github.com/repos/symfony-cli/symfony-cli/releases/latest | awk -F\" '/symfony-cli_.*._amd64\.deb/{print $(NF-1)}' | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')" \
+	&& curl -sS -L --fail -o /tmp/symfonycli.deb  https://github.com/symfony-cli/symfony-cli/releases/download/v${VERSION}/symfony-cli_${VERSION}_$(dpkg-architecture --query DEB_HOST_ARCH).deb \
+&& dpkg -i /tmp/symfonycli.deb \
+&& rm -f /tmp/symfonycli.deb \
+ \
 	\
 # -------------------- wkhtmltopdf --------------------
-	&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-  libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
-&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
-&& dpkg -i /tmp/wkhtmltopdf.deb \
-&& rm -f /tmp/wkhtmltopdf.deb \
+	&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases | awk -F\" '/wkhtmltopdf.*.stretch_amd64\.deb/{print $(NF-1)}' | head -1 )" \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+    libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+  && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  ${VERSION} \
+  && dpkg -i /tmp/wkhtmltopdf.deb \
+  && rm -f /tmp/wkhtmltopdf.deb; \
+fi \
  \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-&& rm -rf /var/lib/apt/lists/* \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+  DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+  && rm -rf /var/lib/apt/lists/*; \
+fi \
  \
 	\
 # -------------------- wpcli --------------------
 	&& curl -sS -L --fail https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
 	\
-# -------------------- cleanup --------------------
-	&& rm -rf /home/${MY_USER}/.*json \
-&& rm -rf /home/${MY_USER}/.cache \
-&& rm -rf /home/${MY_USER}/.composer \
-&& rm -rf /home/${MY_USER}/.config \
-&& rm -rf /home/${MY_USER}/.drush \
-&& rm -rf /home/${MY_USER}/.subversion \
-&& rm -rf /home/${MY_USER}/.v8* \
-\
-&& rm -rf /root/.*json \
-&& rm -rf /root/.cache \
-&& rm -rf /root/.composer \
-&& rm -rf /root/.config \
-&& rm -rf /root/.drush \
-&& rm -rf /root/.subversion \
-&& rm -rf /root/.v8* \
-\
-&& rm -rf /tmp/* \
-&& (rm -rf /tmp/.* || true) \
- \
 	\
 	\
-	&& (rm -rf /root/.gem || true ) \
-	&& (rm -rf /root/.cache || true) \
-	&& (rm -rf /root/.composer || true) \
-	&& (rm -rf /root/.config || true) \
-	&& (rm -rf /root/.npm || true) \
-	\
-	&& (rm -rf /home/devilbox/.cache || true) \
-	&& (rm -rf /home/devilbox/.composer || true) \
-	&& (rm -rf /home/devilbox/.config || true) \
-	&& (rm -rf /home/devilbox/.npm || true) \
-	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
 	&& (rm -rf /usr/local/src/composer/cache/* || true) \
-	&& rm -rf /tmp/* \
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 
@@ -347,12 +360,47 @@ RUN set -eux \
 ###
 RUN set -eux \
 	\
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -402,17 +450,52 @@ RUN set -eux \
 	&& su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \
 	\
 	\
-	&& ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
 	\
-	&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
-	&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox \
-	&& rm -rf /home/devilbox/.npm \
-	&& rm -rf /home/devilbox/.cache \
-	&& rm -rf /home/devilbox/.config \
-	&& rm -rf /tmp/* \
+	&& if [ -f "/opt/nvm/nvm.sh" ]; then \
+		ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
+		\
+		&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
+		&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox; \
+	fi \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -429,22 +512,53 @@ RUN set -eux \
 	&& gem install mdl -v 0.5.0 \
 	\
 	\
-	&& rm -rf /root/.gem \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
 ### Install pip (Python) packages
 ###
 RUN set -eux \
-# -------------------- ansible --------------------
-	&& pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \
-	\
 # -------------------- yamllint --------------------
 	&& pip install --no-cache-dir --force-reinstall yamllint || true \
 	\
@@ -452,13 +566,47 @@ RUN set -eux \
 	&& pip install --no-cache-dir --force-reinstall yq || true \
 	\
 	\
-	&& rm -rf /root/.cache/pip \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -505,8 +653,26 @@ RUN set -eux \
 
 RUN set -eux \
 # -------------------- Software --------------------
-	&& composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \
+	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
+	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+&& su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '8.2' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '8.2' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
+ \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
 	&& git-flow version | grep -E '[0-9][.0-9]+' \
@@ -515,14 +681,13 @@ RUN set -eux \
 	&& phpcs --version | grep -E 'version [0-9][.0-9]+' \
 	&& phpcbf --version | grep -E 'version [0-9][.0-9]+' \
 	&& phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \
-	&& symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \
-	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" \
+	&& symfony -V | grep -Ei 'version\s[0-9][.0-9]+' \
+	&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)"; fi \
 	&& wp --allow-root --version | grep -E '[0-9][.0-9]+' \
 	\
 # -------------------- Composer --------------------
 	\
 # -------------------- PIP --------------------
-	&& ansible --version | grep -E '^ansible [0-9][.0-9]+$' \
 	&& yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \
 	&& yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \
 	\
@@ -543,14 +708,42 @@ RUN set -eux \
 	&& mdl --version | grep -E '[0-9][.0-9]+' \
 	\
 # -------------------- Cleanup --------------------
-	&& rm -rf /home/devilbox/.cache/ \
-	&& rm -rf /home/devilbox/.config/ \
-	&& rm -rf /root/.ansible \
-	&& rm -rf /root/.console \
-	&& rm -rf /root/.composer \
-	&& rm -rf /root/.drush \
-	&& rm -rf /root/.pm2 \
-	&& rm -rf /tmp/* \
+	\
+		&& (rm -rf /home/devilbox/.*json || true) \
+		&& (rm -rf /home/devilbox/.ansible || true) \
+		&& (rm -rf /home/devilbox/.cache || true) \
+		&& (rm -rf /home/devilbox/.composer || true) \
+		&& (rm -rf /home/devilbox/.config || true) \
+		&& (rm -rf /home/devilbox/.console || true) \
+		&& (rm -rf /home/devilbox/.drush || true) \
+		&& (rm -rf /home/devilbox/.gem || true) \
+		&& (rm -rf /home/devilbox/.local || true) \
+		&& (rm -rf /home/devilbox/.node || true) \
+		&& (rm -rf /home/devilbox/.npm || true) \
+		&& (rm -rf /home/devilbox/.pm2 || true) \
+		&& (rm -rf /home/devilbox/.subversion || true) \
+		&& (rm -rf /home/devilbox/.v8* || true) \
+		&& (rm -rf /home/devilbox/node_modules || true) \
+		&& (rm -rf /home/devilbox/yarn.lock || true) \
+		\
+		&& (rm -rf /root/.*json || true) \
+		&& (rm -rf /root/.ansible || true) \
+		&& (rm -rf /root/.cache || true) \
+		&& (rm -rf /root/.composer || true) \
+		&& (rm -rf /root/.config || true) \
+		&& (rm -rf /root/.console || true) \
+		&& (rm -rf /root/.drush || true) \
+		&& (rm -rf /root/.gem || true) \
+		&& (rm -rf /root/.local || true) \
+		&& (rm -rf /root/.node || true) \
+		&& (rm -rf /root/.npm || true) \
+		&& (rm -rf /root/.pm2 || true) \
+		&& (rm -rf /root/.subversion || true) \
+		&& (rm -rf /root/.v8* || true) \
+		&& (rm -rf /root/node_modules || true) \
+		&& (rm -rf /root/yarn.lock || true) \
+		\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 

Makefile

@@ -2,109 +2,87 @@ ifneq (,)
 .error This Makefile requires GNU Make.
 endif
 
-
-# -------------------------------------------------------------------------------------------------
-# Docker configuration
-# -------------------------------------------------------------------------------------------------
-
-CURRENT_DIR = $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
-
-DIR = Dockerfiles
-IMAGE = devilbox/php-fpm
-ARCH  = linux/amd64
-
-NO_CACHE =
-PHP_EXT_DIR =
-
-# Run checks after each module has been installed (slow, but yields errors faster)
-FAIL_FAST = False
-
-# File lint
-FL_VERSION = 0.3
-FL_IGNORES = .git/,.github/
-
-
-# -------------------------------------------------------------------------------------------------
-#  DEFAULT TARGET
-# -------------------------------------------------------------------------------------------------
-
-help:
-	@echo
-	@echo "             _         _ _ _            __   _           ___          "
-	@echo "           _| |___ _ _<_| | |_ _____   / ___| |_ ___ ___| | ___._ _ _ "
-	@echo "          / . / ._| | | | | . / . \ \// | . | . | . |___| || . | ' ' |"
-	@echo "          \___\___|__/|_|_|___\___/\_/_/|  _|_|_|  _/   |_||  _|_|_|_|"
-	@echo "                                        |_|     |_|        |_|        "
-	@echo
-	@echo
-	@echo "Targets"
-	@echo "--------------------------------------------------------------------------------"
-	@echo
-	@echo "lint                          Lint project files and repository"
-	@echo
-	@echo "gen-readme [VERSION=]         Update README with PHP modules from built images."
-	@echo "gen-dockerfiles [FAIL_FAST=]  Generate Dockerfiles from templates."
-	@echo
-	@echo "build-base VERSION= [ARGS=]   Build base image by specified version"
-	@echo "build-mods VERSION= [ARGS=]   Build mods image by specified version"
-	@echo "build-prod VERSION= [ARGS=]   Build prod image by specified version"
-	@echo "build-work VERSION= [ARGS=]   Build work image by specified version"
-	@echo
-	@echo "rebuild-base VERSION= [ARGS=] Rebuild base image by specified version"
-	@echo "rebuild-mods VERSION= [ARGS=] Rebuild mods image by specified version"
-	@echo "rebuild-prod VERSION= [ARGS=] Rebuild prod image by specified version"
-	@echo "rebuild-work VERSION= [ARGS=] Rebuild work image by specified version"
-	@echo
-	@echo "test-base VERSION=            Test base image by specified version"
-	@echo "test-mods VERSION=            Test mods image by specified version"
-	@echo "test-prod VERSION=            Test prod image by specified version"
-	@echo "test-work VERSION=            Test work image by specified version"
-	@echo
-	@echo
-	@echo "Variables"
-	@echo "--------------------------------------------------------------------------------"
-	@echo
-	@echo "VERSION                       One of '5.2', '5.3', '5.4', '5.5', '5.6', '7.0',"
-	@echo "                                      '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2'."
-	@echo "                              For gen-readme target it is optional and if not"
-	@echo "                              specified, it will generate for all versions."
-	@echo
-	@echo "FAIL_FAST                     Either 'True' or 'False' (defaults to 'False')."
-	@echo "                              If set to 'True', each module install has an"
-	@echo "                              immediate check, which is very slow for CI, but"
-	@echo "                              yields errors immediately."
-	@echo "                              If set to 'False', checks are done at the end."
-	@echo
-	@echo "ARGS                          Can be added to all build-* and rebuild-* targets"
-	@echo "                              to supply additional docker build options."
-
-
-# -------------------------------------------------------------------------------------------------
-#  Lint Targets
-# -------------------------------------------------------------------------------------------------
-
-lint: lint-files
-lint: lint-yaml
-lint: lint-changelog
-lint: lint-workflow
-
-lint-workflow:
-	@echo "################################################################################"
-	@echo "# Lint Workflow"
-	@echo "################################################################################"
-	@\
-	GIT_CURR_MAJOR="$$( git tag | sort -V | tail -1 | sed 's|\.[0-9]*$$||g' )"; \
-	GIT_CURR_MINOR="$$( git tag | sort -V | tail -1 | sed 's|^[0-9]*\.||g' )"; \
-	GIT_NEXT_TAG="$${GIT_CURR_MAJOR}.$$(( GIT_CURR_MINOR + 1 ))"; \
-		if ! grep 'refs:' -A 100 .github/workflows/nightly.yml \
-		| grep  "          - '$${GIT_NEXT_TAG}'" >/dev/null; then \
-		echo "[ERR] New Tag required in .github/workflows/nightly.yml: $${GIT_NEXT_TAG}"; \
-			exit 1; \
-		else \
-		echo "[OK] Git Tag present in .github/workflows/nightly.yml: $${GIT_NEXT_TAG}"; \
+# Ensure additional Makefiles are present
+MAKEFILES = Makefile.docker Makefile.lint
+$(MAKEFILES): URL=https://raw.githubusercontent.com/devilbox/makefiles/master/$(@)
+$(MAKEFILES):
+	@if ! (curl --fail -sS -o $(@) $(URL) || wget -O $(@) $(URL)); then \
+		echo "Error, curl or wget required."; \
+		echo "Exiting."; \
+		false; \
 	fi
+include $(MAKEFILES)
+
+# Set default Target
+.DEFAULT_GOAL := help
+
+
+# -------------------------------------------------------------------------------------------------
+# Default configuration
+# -------------------------------------------------------------------------------------------------
+# Own vars
+TAG        = latest
+
+# Makefile.docker overwrites
+NAME       = PHP
+#VERSION    = 5.5
+IMAGE      = devilbox/php-fpm
+#FLAVOUR    = debian
+#STAGE      = base
+FILE       = Dockerfile-$(VERSION)
+DIR        = Dockerfiles/$(STAGE)
+
+ifeq ($(strip $(TAG)),latest)
+DOCKER_TAG = $(VERSION)-$(STAGE)
+BASE_TAG   = $(VERSION)-base
+MODS_TAG   = $(VERSION)-mods
+PROD_TAG   = $(VERSION)-prod
+WORK_TAG   = $(VERSION)-work
+else
+DOCKER_TAG = $(VERSION)-$(STAGE)-$(TAG)
+BASE_TAG   = $(VERSION)-base-$(TAG)
+MODS_TAG   = $(VERSION)-mods-$(TAG)
+PROD_TAG   = $(VERSION)-prod-$(TAG)
+WORK_TAG   = $(VERSION)-work-$(TAG)
+endif
+ARCH       = linux/amd64
+
+
+# Makefile.lint overwrites
+FL_IGNORES  = .git/,.github/,tests/
+SC_IGNORES  = .git/,.github/,tests/
+
+
+# -------------------------------------------------------------------------------------------------
+# Default Target
+# -------------------------------------------------------------------------------------------------
+.PHONY: help
+help:
+	@echo "lint                                     Lint project files and repository"
+	@echo
+	@echo "build [ARCH=...] [TAG=...]               Build Docker image"
+	@echo "rebuild [ARCH=...] [TAG=...]             Build Docker image without cache"
+	@echo "push [ARCH=...] [TAG=...]                Push Docker image to Docker hub"
+	@echo
+	@echo "manifest-create [ARCHES=...] [TAG=...]   Create multi-arch manifest"
+	@echo "manifest-push [TAG=...]                  Push multi-arch manifest"
+	@echo
+	@echo "test [ARCH=...]                          Test built Docker image"
 	@echo
 
+
+# -------------------------------------------------------------------------------------------------
+# Overwrite Targets
+# -------------------------------------------------------------------------------------------------
+
+# Append additional target to lint
+lint: lint-changelog
+lint: lint-ansible
+
+###
+### Ensures CHANGELOG has an entry
+###
+.PHONY: lint-changelog
 lint-changelog:
 	@echo "################################################################################"
 	@echo "# Lint Changelog"
@@ -121,46 +99,119 @@ lint-changelog:
 	fi
 	@echo
 
-lint-files:
-	@echo "################################################################################"
-	@echo "# Lint Files"
-	@echo "################################################################################"
-	@docker run --rm $$(tty -s && echo "-it" || echo) -v $(CURRENT_DIR):/data cytopia/file-lint:$(FL_VERSION) file-cr --text --ignore '$(FL_IGNORES)' --path .
-	@docker run --rm $$(tty -s && echo "-it" || echo) -v $(CURRENT_DIR):/data cytopia/file-lint:$(FL_VERSION) file-crlf --text --ignore '$(FL_IGNORES)' --path .
-	@docker run --rm $$(tty -s && echo "-it" || echo) -v $(CURRENT_DIR):/data cytopia/file-lint:$(FL_VERSION) file-trailing-single-newline --text --ignore '$(FL_IGNORES)' --path .
-	@docker run --rm $$(tty -s && echo "-it" || echo) -v $(CURRENT_DIR):/data cytopia/file-lint:$(FL_VERSION) file-trailing-space --text --ignore '$(FL_IGNORES)' --path .
-	@docker run --rm $$(tty -s && echo "-it" || echo) -v $(CURRENT_DIR):/data cytopia/file-lint:$(FL_VERSION) file-utf8 --text --ignore '$(FL_IGNORES)' --path .
-	@docker run --rm $$(tty -s && echo "-it" || echo) -v $(CURRENT_DIR):/data cytopia/file-lint:$(FL_VERSION) file-utf8-bom --text --ignore '$(FL_IGNORES)' --path .
-	@echo
-
-lint-yaml:
-	@# Lint all files
-	@echo "################################################################################"
-	@echo "# Lint Yaml"
-	@echo "################################################################################"
-	@docker run --rm $$(tty -s && echo "-it" || echo) -v $(CURRENT_DIR):/data cytopia/yamllint .
-	@echo
+###
+### Ensures Ansible Dockerfile generation is current
+###
+.PHONY: lint-ansible
+lint-ansible: gen-dockerfiles
+	@git diff --quiet || { echo "Build Changes"; git diff; git status; false; }
 
 
 # -------------------------------------------------------------------------------------------------
-#  GENERATE TARGETS
+# Docker Targets
 # -------------------------------------------------------------------------------------------------
 
-gen-readme:
-ifeq ($(strip $(VERSION)),)
-	@echo "Generate README.md for all PHP versions"
-	cd build; ./gen-readme.sh $(ARCH)
-else
-	@echo "Generate README.md for PHP $(VERSION)"
-	@$(MAKE) --no-print-directory _check-version
-	@$(MAKE) --no-print-directory _check-image-exists _EXIST_IMAGE=base
-	@$(MAKE) --no-print-directory _check-image-exists _EXIST_IMAGE=mods
-	cd build; ./gen-readme.sh $(ARCH) $(VERSION)
+# ---- ONLY FOR "mods" images ----
+# When builds mods, we have a builder image and then copy everything to the final
+# target image. In order to do so, we pass a build-arg EXT_DIR, which contains
+# the variable directory of extensions to copy.
+# The only way to "LAZY" fetch it, is by doing a call to the base image and populate
+# a Makefile variable with its value upon call.
+ifeq ($(strip $(STAGE)),mods)
+EXT_DIR=$$( docker run --rm --platform $(ARCH) --entrypoint=php $(IMAGE):$(BASE_TAG) -r \
+	'echo ini_get("extension_dir");'\
+)
 endif
 
+# Use Buldkit for building
+export DOCKER_BUILDKIT=1
+
+.PHONY: build
+build: check-stage-is-set
+build: check-parent-image-exists
+build: ARGS+=--build-arg EXT_DIR=$(EXT_DIR)
+build: docker-arch-build
+
+.PHONY: rebuild
+rebuild: check-stage-is-set
+rebuild: check-parent-image-exists
+rebuild: ARGS+=--build-arg EXT_DIR=$(EXT_DIR)
+rebuild: docker-arch-rebuild
+
+.PHONY: push
+push: check-stage-is-set
+push: check-version-is-set
+push: docker-arch-push
+
+.PHONY: tag
+tag: check-stage-is-set
+tag: check-version-is-set
+tag:
+	docker tag $(IMAGE):$(VERSION)-$(STAGE) $(IMAGE):$(DOCKER_TAG)
+
+
+# -------------------------------------------------------------------------------------------------
+# Save / Load Targets
+# -------------------------------------------------------------------------------------------------
+.PHONY: save
+save: check-stage-is-set
+save: check-version-is-set
+save: check-current-image-exists
+save: docker-save
+
+.PHONY: load
+load: docker-load
+
+.PHONY: save-verify
+save-verify: save
+save-verify: load
+
+
+# -------------------------------------------------------------------------------------------------
+# Manifest Targets
+# -------------------------------------------------------------------------------------------------
+.PHONY: manifest-create
+manifest-create: docker-manifest-create
+
+.PHONY: manifest-push
+manifest-push: docker-manifest-push
+
+
+# -------------------------------------------------------------------------------------------------
+# Test Targets
+# -------------------------------------------------------------------------------------------------
+.PHONY: test
+test: check-stage-is-set
+test: check-current-image-exists
+test: test-integration
+
+.PHONY: test-integration
+test-integration:
+	./tests/test.sh $(IMAGE) $(ARCH) $(VERSION) $(STAGE) $(DOCKER_TAG)
+
+
+# -------------------------------------------------------------------------------------------------
+# Generate Targets
+# -------------------------------------------------------------------------------------------------
+
+###
+### Generate README (requires images to be built)
+###
+.PHONY: gen-readme
+gen-readme: check-version-is-set
+gen-readme:
+	@echo "################################################################################"
+	@echo "# Generate README.md for PHP $(VERSION) ($(IMAGE):$(DOCKER_TAG)) on $(ARCH)"
+	@echo "################################################################################"
+	./build/gen-readme.sh $(IMAGE) $(ARCH) $(BASE_TAG) $(MODS_TAG) $(VERSION)
+	git diff --quiet || { echo "Build Changes"; git diff; git status; false; }
+
+###
+### Generate Dockerfiles
+###
+.PHONY: gen-dockerfiles
 gen-dockerfiles:
 	docker run --rm \
-		--platform $(ARCH) \
 		$$(tty -s && echo "-it" || echo) \
 		-e USER=ansible \
 		-e MY_UID=$$(id -u) \
@@ -175,254 +226,118 @@ gen-dockerfiles:
 			--diff $(ARGS)
 
 
-# -------------------------------------------------------------------------------------------------
-#  BUILD TARGETS
-# -------------------------------------------------------------------------------------------------
-
-build-base: _check-version
-build-base:
-	docker build $(NO_CACHE) \
-		--platform $(ARCH) \
-		--label "org.opencontainers.image.created"="$$(date --rfc-3339=s)" \
-		--label "org.opencontainers.image.version"="$$(git rev-parse --abbrev-ref HEAD)" \
-		--label "org.opencontainers.image.revision"="$$(git rev-parse HEAD))" \
-		$(ARGS) \
-		-t $(IMAGE):${VERSION}-base \
-		-f $(DIR)/base/Dockerfile-${VERSION} $(DIR)/base
-
-
-build-mods: _check-version
-build-mods: _EXIST_IMAGE=base
-build-mods: _check-image-exists
-build-mods:
-ifeq ($(strip $(TARGET)),)
-	docker build $(NO_CACHE) \
-		--platform $(ARCH) \
-		--target builder \
-		-t $(IMAGE):$(VERSION)-mods \
-		-f $(DIR)/mods/Dockerfile-$(VERSION) $(DIR)/mods;
-	@# $(NO_CACHE) is removed, as it would otherwise rebuild the 'builder' image again.
-	docker build \
-		--platform $(ARCH) \
-		--target final \
-		--label "org.opencontainers.image.created"="$$(date --rfc-3339=s)" \
-		--label "org.opencontainers.image.version"="$$(git rev-parse --abbrev-ref HEAD)" \
-		--label "org.opencontainers.image.revision"="$$(git rev-parse HEAD)" \
-		--build-arg EXT_DIR="$$( docker run --rm --platform $(ARCH) --entrypoint=php $(IMAGE):$(VERSION)-mods -i \
-			| grep ^extension_dir \
-			| awk -F '=>' '{print $$2}' \
-			| xargs \
-		)" \
-		$(ARGS) \
-		-t $(IMAGE):$(VERSION)-mods \
-		-f $(DIR)/mods/Dockerfile-$(VERSION) $(DIR)/mods;
-else
-	docker build $(NO_CACHE) \
-		--platform $(ARCH) \
-		--target $(TARGET) \
-		--label "org.opencontainers.image.created"="$$(date --rfc-3339=s)" \
-		--label "org.opencontainers.image.version"="$$(git rev-parse --abbrev-ref HEAD)" \
-		--label "org.opencontainers.image.revision"="$$(git rev-parse HEAD)" \
-		$(ARGS) \
-		-t $(IMAGE):$(VERSION)-mods \
-		-f $(DIR)/mods/Dockerfile-$(VERSION) $(DIR)/mods
-endif
-
-
-build-prod: _check-version
-build-prod: _EXIST_IMAGE=mods
-build-prod: _check-image-exists
-build-prod:
-	docker build $(NO_CACHE) \
-		--platform $(ARCH) \
-		--label "org.opencontainers.image.created"="$$(date --rfc-3339=s)" \
-		--label "org.opencontainers.image.version"="$$(git rev-parse --abbrev-ref HEAD)" \
-		--label "org.opencontainers.image.revision"="$$(git rev-parse HEAD)" \
-		$(ARGS) \
-		-t $(IMAGE):${VERSION}-prod \
-		-f $(DIR)/prod/Dockerfile-${VERSION} $(DIR)/prod
-
-
-build-work: _check-version
-build-work: _EXIST_IMAGE=prod
-build-work: _check-image-exists
-build-work:
-	docker build $(NO_CACHE) \
-		--platform $(ARCH) \
-		--label "org.opencontainers.image.created"="$$(date --rfc-3339=s)" \
-		--label "org.opencontainers.image.version"="$$(git rev-parse --abbrev-ref HEAD)" \
-		--label "org.opencontainers.image.revision"="$$(git rev-parse HEAD)" \
-		--build-arg ARCH=$(ARCH) \
-		$(ARGS) \
-		-t $(IMAGE):${VERSION}-work \
-		-f $(DIR)/work/Dockerfile-${VERSION} $(DIR)/work
-
 
 # -------------------------------------------------------------------------------------------------
-#  REBUILD TARGETS
+# HELPER TARGETS
 # -------------------------------------------------------------------------------------------------
 
-rebuild-base: _pull-base-image
-rebuild-base: NO_CACHE=--no-cache
-rebuild-base: build-base
+###
+### Ensures the VERSION variable is set
+###
+.PHONY: check-version-is-set
+check-version-is-set:
+	@if [ "$(VERSION)" = "" ]; then \
+		echo "This make target requires the VERSION variable to be set."; \
+		echo "make <target> VERSION="; \
+		echo "Exiting."; \
+		exit 1; \
+	fi
 
+###
+### Ensures the STAGE variable is set
+###
+.PHONY: check-stage-is-set
+check-stage-is-set:
+	@if [ "$(STAGE)" = "" ]; then \
+		echo "This make target requires the STAGE variable to be set."; \
+		echo "make <target> STAGE="; \
+		echo "Exiting."; \
+		exit 1; \
+	fi
+	@if [ "$(STAGE)" != "base" ] && [ "$(STAGE)" != "mods" ] && [ "$(STAGE)" != "prod" ] && [ "$(STAGE)" != "work" ]; then \
+		echo "Error, Flavour can only be one of 'base', 'mods', 'prod', or 'work'."; \
+		echo "Exiting."; \
+		exit 1; \
+	fi
 
-rebuild-mods: NO_CACHE=--no-cache
-rebuild-mods: build-mods
-
-
-rebuild-prod: NO_CACHE=--no-cache
-rebuild-prod: build-prod
-
-
-rebuild-work: NO_CACHE=--no-cache
-rebuild-work: build-work
-
-
-# -------------------------------------------------------------------------------------------------
-#  TEST TARGETS
-# -------------------------------------------------------------------------------------------------
-
-test-base: _check-version
-test-base: _EXIST_IMAGE=base
-test-base: _check-image-exists
-test-base:
-	./tests/test.sh $(IMAGE) $(ARCH) $(VERSION) base
-
-
-test-mods: _check-version
-test-mods: _EXIST_IMAGE=mods
-test-mods: _check-image-exists
-test-mods: _check-version
-	./tests/test.sh $(IMAGE) $(ARCH) $(VERSION) mods
-
-
-test-prod: _check-version
-test-prod: _EXIST_IMAGE=prod
-test-prod: _check-image-exists
-test-prod: _check-version
-	./tests/test.sh $(IMAGE) $(ARCH) $(VERSION) prod
-
-
-test-work: _check-version
-test-work: _EXIST_IMAGE=work
-test-work: _check-image-exists
-test-work: _check-version
-	./tests/test.sh $(IMAGE) $(ARCH) $(VERSION) work
-
-
-# -------------------------------------------------------------------------------------------------
-#  DOCKERHUB TARGETS
-# -------------------------------------------------------------------------------------------------
-login:
-ifeq ($(strip $(USERNAME)),)
-	@$(info This make target requires the USERNAME variable to be set.)
-	@$(info make login USERNAME= PASSWORD=)
-	@$(info )
-	@$(error Exiting)
-endif
-ifeq ($(strip $(PASSWORD)),)
-	@$(info This make target requires the PASSWORD variable to be set.)
-	@$(info make login USERNAME= PASSWORD=)
-	@$(info )
-	@$(error Exiting)
-endif
-	@yes | docker login --username $(USERNAME) --password $(PASSWORD)
-
-
-push:
-ifeq ($(strip $(TAG)),)
-	@$(info This make target requires the TAG variable to be set.)
-	@$(info make push TAG=)
-	@$(info )
-	@$(error Exiting)
-endif
-	docker push $(IMAGE):$(TAG)
-
-
-tag:
-ifeq ($(strip $(OLD_TAG)),)
-	@$(info This make target requires the OLD_TAG variable to be set.)
-	@$(info make tag OLD_TAG= NEW_TAG=)
-	@$(info )
-	@$(error Exiting)
-endif
-ifeq ($(strip $(NEW_TAG)),)
-	@$(info This make target requires the NEW_TAG variable to be set.)
-	@$(info make tag OLD_TAG= NEW_TAG=)
-	@$(info )
-	@$(error Exiting)
-endif
-	docker tag $(IMAGE):$(OLD_TAG) $(IMAGE):$(NEW_TAG)
-
-
-
-# -------------------------------------------------------------------------------------------------
-#  HELPER TARGETS
-# -------------------------------------------------------------------------------------------------
-
-_check-version:
-ifeq ($(strip $(VERSION)),)
-	@$(info This make target requires the VERSION variable to be set.)
-	@$(info make build-<flavour> VERSION=7.3)
-	@$(info )
-	@$(error Exiting)
-endif
-ifeq ($(VERSION),5.2)
-else
-ifeq ($(VERSION),5.3)
-else
-ifeq ($(VERSION),5.4)
-else
-ifeq ($(VERSION),5.5)
-else
-ifeq ($(VERSION),5.6)
-else
-ifeq ($(VERSION),7.0)
-else
-ifeq ($(VERSION),7.1)
-else
-ifeq ($(VERSION),7.2)
-else
-ifeq ($(VERSION),7.3)
-else
-ifeq ($(VERSION),7.4)
-else
-ifeq ($(VERSION),8.0)
-else
-ifeq ($(VERSION),8.1)
-else
-ifeq ($(VERSION),8.2)
-else
-	@$(info VERSION can only be: '5.2', '5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' or '8.2')
-	@$(info )
-	@$(error Exiting)
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-	@echo "Version $(VERSION) is valid"
-
-
-_check-image-exists:
-	@if [ "$$(docker images -q $(IMAGE):$(VERSION)-$(_EXIST_IMAGE))" = "" ]; then \
-		>&2 echo "Docker image '$(IMAGE):$(VERSION)-$(_EXIST_IMAGE)' was not found locally."; \
+###
+### Checks if current image exists and is of correct architecture
+###
+.PHONY: check-current-image-exists
+check-current-image-exists: check-stage-is-set
+check-current-image-exists:
+	@if [ "$$( docker images -q $(IMAGE):$(DOCKER_TAG) )" = "" ]; then \
+		>&2 echo "Docker image '$(IMAGE):$(DOCKER_TAG)' was not found locally."; \
 		>&2 echo "Either build it first or explicitly pull it from Dockerhub."; \
 		>&2 echo "This is a safeguard to not automatically pull the Docker image."; \
 		>&2 echo; \
-		false; \
+		exit 1; \
+	else \
+		echo "OK: Image $(IMAGE):$(DOCKER_TAG) exists"; \
+	fi; \
+	OS="$$( docker image inspect $(IMAGE):$(DOCKER_TAG) --format '{{.Os}}' )"; \
+	ARCH="$$( docker image inspect $(IMAGE):$(DOCKER_TAG) --format '{{.Architecture}}' )"; \
+	if [ "$${OS}/$${ARCH}" != "$(ARCH)" ]; then \
+		>&2 echo "Docker image '$(IMAGE):$(DOCKER_TAG)' has invalid architecture: $${OS}/$${ARCH}"; \
+		>&2 echo "Expected: $(ARCH)"; \
+		>&2 echo; \
+		exit 1; \
+	else \
+		echo "OK: Image $(IMAGE):$(DOCKER_TAG) is of arch $${OS}/$${ARCH}"; \
+	fi
+
+###
+### Checks if parent image exists and is of correct architecture
+###
+.PHONY: check-parent-image-exists
+check-parent-image-exists: check-stage-is-set
+check-parent-image-exists:
+	@if [ "$(STAGE)" = "work" ]; then \
+		if [ "$$( docker images -q $(IMAGE):$(PROD_TAG) )" = "" ]; then \
+			>&2 echo "Docker image '$(IMAGE):$(PROD_TAG)' was not found locally."; \
+			>&2 echo "Either build it first or explicitly pull it from Dockerhub."; \
+			>&2 echo "This is a safeguard to not automatically pull the Docker image."; \
+			>&2 echo; \
+			exit 1; \
+		fi; \
+		OS="$$( docker image inspect $(IMAGE):$(PROD_TAG) --format '{{.Os}}' )"; \
+		ARCH="$$( docker image inspect $(IMAGE):$(PROD_TAG) --format '{{.Architecture}}' )"; \
+		if [ "$${OS}/$${ARCH}" != "$(ARCH)" ]; then \
+			>&2 echo "Docker image '$(IMAGE):$(PROD_TAG)' has invalid architecture: $${OS}/$${ARCH}"; \
+			>&2 echo "Expected: $(ARCH)"; \
+			>&2 echo; \
+			exit 1; \
+		fi; \
+	elif [ "$(STAGE)" = "prod" ]; then \
+		if [ "$$( docker images -q $(IMAGE):$(MODS_TAG) )" = "" ]; then \
+			>&2 echo "Docker image '$(IMAGE):$(MODS_TAG)' was not found locally."; \
+			>&2 echo "Either build it first or explicitly pull it from Dockerhub."; \
+			>&2 echo "This is a safeguard to not automatically pull the Docker image."; \
+			>&2 echo; \
+			exit 1; \
+		fi; \
+		OS="$$( docker image inspect $(IMAGE):$(MODS_TAG) --format '{{.Os}}' )"; \
+		ARCH="$$( docker image inspect $(IMAGE):$(MODS_TAG) --format '{{.Architecture}}' )"; \
+		if [ "$${OS}/$${ARCH}" != "$(ARCH)" ]; then \
+			>&2 echo "Docker image '$(IMAGE):$(MODS_TAG)' has invalid architecture: $${OS}/$${ARCH}"; \
+			>&2 echo "Expected: $(ARCH)"; \
+			>&2 echo; \
+			exit 1; \
+		fi; \
+	elif [ "$(STAGE)" = "mods" ]; then \
+		if [ "$$( docker images -q $(IMAGE):$(BASE_TAG) )" = "" ]; then \
+			>&2 echo "Docker image '$(IMAGE):$(BASE_TAG)' was not found locally."; \
+			>&2 echo "Either build it first or explicitly pull it from Dockerhub."; \
+			>&2 echo "This is a safeguard to not automatically pull the Docker image."; \
+			>&2 echo; \
+			exit 1; \
+		fi; \
+		OS="$$( docker image inspect $(IMAGE):$(BASE_TAG) --format '{{.Os}}' )"; \
+		ARCH="$$( docker image inspect $(IMAGE):$(BASE_TAG) --format '{{.Architecture}}' )"; \
+		if [ "$${OS}/$${ARCH}" != "$(ARCH)" ]; then \
+			>&2 echo "Docker image '$(IMAGE):$(BASE_TAG)' has invalid architecture: $${OS}/$${ARCH}"; \
+			>&2 echo "Expected: $(ARCH)"; \
+			>&2 echo; \
+			exit 1; \
+		fi; \
 	fi;
-
-
-_pull-base-image:
-	@echo "Pulling root image for PHP ${VERSION}"
-	docker pull --platform $(ARCH) $(shell grep FROM $(DIR)/base/Dockerfile-${VERSION} | sed 's/^FROM\s*//g';)

README.md

@@ -9,6 +9,8 @@
 [![License](https://img.shields.io/badge/license-MIT-%233DA639.svg)](https://opensource.org/licenses/MIT)
 
 
+**Available Architectures:**  `amd64`, `arm64`
+
 This repository will provide you fully functional PHP-FPM Docker images in different flavours,
 versions and packed with different types of integrated PHP modules. It also solves the problem of **[syncronizing file permissions](#unsynchronized-permissions)** of mounted volumes between the host and the container.
 
@@ -709,12 +711,12 @@ Check out this table to see which Docker image provides what PHP modules.
   <tr>
    <th>8.0</th>
    <td id="80-base">Core, ctype, curl, date, dom, FFI, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, sodium, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib</td>
-   <td id="80-mods">amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, Phar, posix, pspell, psr, rdkafka, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, xdebug, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib</td>
+   <td id="80-mods">amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, Phar, posix, pspell, psr, rdkafka, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, vips, xdebug, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib</td>
   </tr>
   <tr>
    <th>8.1</th>
    <td id="81-base">Core, ctype, curl, date, dom, FFI, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, sodium, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib</td>
-   <td id="81-mods">amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, intl, json, ldap, libxml, mbstring, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, Phar, posix, pspell, psr, rdkafka, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, sqlsrv, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, xdebug, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib</td>
+   <td id="81-mods">amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, intl, json, ldap, libxml, mbstring, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, Phar, posix, pspell, psr, rdkafka, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, vips, xdebug, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib</td>
   </tr>
   <tr>
    <th>8.2</th>

build/ansible/DOCKERFILES/Dockerfile-base.j2

@@ -60,8 +60,8 @@ RUN set -eux \
 ### Upgrade (install ps)
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		dpkg-dev \
 		procps \
 	&& rm -rf /var/lib/apt/lists/*

build/ansible/DOCKERFILES/Dockerfile-mods.j2

@@ -31,9 +31,8 @@ FROM devilbox/php-fpm:{{ php_version }}-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 {% for build_dep in build_deps | unique | sort %}
 		{{ build_dep }} \
 {% endfor %}
@@ -58,7 +57,8 @@ RUN set -eux \
 		patch \
 		pkg-config \
 		re2c \
-		xz-utils
+		xz-utils \
+	&& rm -rf /var/lib/apt/lists/*
 
 
 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -312,9 +312,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
@@ -342,22 +342,11 @@ LABEL "org.opencontainers.image.description"="PHP-FPM {{ php_version }}-mods"
 
 
 ###
-### Copy artifacts from builder
-###
-ARG EXT_DIR
-COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/bin/ /usr/local/bin/
-COPY --from=builder /usr/local/lib/ /usr/local/lib/
-COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
-
-
-###
-### Install
+### Install runtime libraries
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 {# Loop over enabled run-time dependencies -#}
 {%- set run_deps = [] -%}
 {%- for ext in extensions_enabled -%}
@@ -388,7 +377,18 @@ RUN set -eux \
 
 
 ###
-### Post Install
+### Copy artifacts from builder
+###
+ARG EXT_DIR
+COPY --from=builder ${EXT_DIR}/ ${EXT_DIR}/
+COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /usr/local/lib/ /usr/local/lib/
+COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
+
+
+###
+### Post Install executions
 ###
 {# Loop over enabled extensions #}
 {%- set post_commands = {} -%}

build/ansible/DOCKERFILES/Dockerfile-prod.j2

@@ -26,9 +26,8 @@ LABEL "org.opencontainers.image.description"="PHP-FPM {{ php_version }}-prod"
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,18 +35,21 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
+# Fix: rsyslogd: imklog: cannot open kernel log (/proc/kmsg): Operation not permitted.
+	&& sed -i''  's/.*imklog.*//g' /etc/rsyslog.conf \
+	\
+# Setup Supervisor
 	&& rm -rf /etc/supervisor* \
 	&& mkdir -p /var/log/supervisor \
 	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 {% if debug %}

build/ansible/DOCKERFILES/Dockerfile-work.j2

@@ -46,9 +46,8 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
@@ -81,8 +80,8 @@ RUN set -eux \
 		{%- endif -%}
 	{%- endif -%}
 {%- endfor -%}{{ "\n\t" }}\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -120,11 +119,13 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 {% if php_version in [7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2] %}
 		mariadb-client \
 {% else %}
 		mysql-client \
 {% endif %}
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -133,7 +134,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -151,33 +151,17 @@ RUN set -eux \
 		wget \
 		whois \
 		xz-utils \
-		yarn \
 		zip \
 		zlib1g-dev \
 		zsh \
 {% if php_version in [5.6, 7.0] %}
 		zsh-common \
 {% endif %}
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-RUN set -eux \
-	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-		DEBIAN_FRONTEND=noninteractive apt-get update -q \
-		&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
-			mongodb-org-shell \
-			mongodb-org-tools; \
-	fi \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -232,19 +216,17 @@ RUN set -eux \
 {%- else -%}
 	{{ "\n\t" }}\{{ "\n" }}
 {%- endif %}
-	&& (rm -rf /root/.gem || true ) \
-	&& (rm -rf /root/.cache || true) \
-	&& (rm -rf /root/.composer || true) \
-	&& (rm -rf /root/.config || true) \
-	&& (rm -rf /root/.npm || true) \
 	\
-	&& (rm -rf /home/devilbox/.cache || true) \
-	&& (rm -rf /home/devilbox/.composer || true) \
-	&& (rm -rf /home/devilbox/.config || true) \
-	&& (rm -rf /home/devilbox/.npm || true) \
+	{% for f in directory_to_clean %}
+	&& (rm -rf /home/devilbox/{{ f }} || true) \
+	{% endfor %}
+	\
+	{% for f in directory_to_clean %}
+	&& (rm -rf /root/{{ f }} || true) \
+	{% endfor %}
 	\
 	&& (rm -rf /usr/local/src/composer/cache/* || true) \
-	&& rm -rf /tmp/* \
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 
@@ -293,12 +275,21 @@ RUN set -eux \
 {%- else -%}
 	{{ "\n\t" }}\{{ "\n" }}
 {%- endif %}
-	&& rm -rf /tmp/* \
+	\
+	{% for f in directory_to_clean %}
+	&& (rm -rf /home/devilbox/{{ f }} || true) \
+	{% endfor %}
+	\
+	{% for f in directory_to_clean %}
+	&& (rm -rf /root/{{ f }} || true) \
+	{% endfor %}
+	\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -316,18 +307,18 @@ RUN set -eux \
 		{%- endif -%}
 		{#- Version specific gem version available? -#}
 		{%- if php_version in npm_available[tool] and 'version' in npm_available[tool][php_version] -%}
-			{{ "\n\t" }}&& su -c '. /opt/nvm/nvm.sh; npm install -g --force {{ npm_available[tool]['name'] }} {{ npm_available[tool][php_version]['version'] }}' devilbox \
+			{{ "\n\t" }}&& su -c '. {{ nvm_home }}/nvm.sh; npm install -g --force {{ npm_available[tool]['name'] }} {{ npm_available[tool][php_version]['version'] }}' devilbox \
 		{#- Generic gem version  available? -#}
 		{%- elif 'all' in npm_available[tool] and 'version' in npm_available[tool]['all'] -%}
-			{{ "\n\t" }}&& su -c '. /opt/nvm/nvm.sh; npm install -g --force {{ npm_available[tool]['name'] }} {{ npm_available[tool]['all']['version'] }}' devilbox \
+			{{ "\n\t" }}&& su -c '. {{ nvm_home }}/nvm.sh; npm install -g --force {{ npm_available[tool]['name'] }} {{ npm_available[tool]['all']['version'] }}' devilbox \
 		{#- No version info available -#}
 		{%- else -%}
-			{{ "\n\t" }}&& su -c '. /opt/nvm/nvm.sh; npm install -g --force {{ npm_available[tool]['name'] }}' devilbox \
+			{{ "\n\t" }}&& su -c '. {{ nvm_home }}/nvm.sh; npm install -g --force {{ npm_available[tool]['name'] }}' devilbox \
 		{%- endif -%}
 		{#- Fail fast version -#}
 		{%- if build_fail_fast -%}
 			{%- if 'check' in npm_available[tool] -%}
-				{{ "\n\t" }}&& PATH=$PATH:/opt/nvm/versions/node/$(/bin/ls -1 /opt/nvm/versions/node/ | sort -V | tail -1)/bin /opt/nvm/versions/node/$(/bin/ls -1 /opt/nvm/versions/node/ | sort -V | tail -1)/bin/{{ npm_available[tool]['check'] }}{{ "\n\n" }}
+				{{ "\n\t" }}&& PATH=$PATH:{{ nvm_home }}/versions/node/$(/bin/ls -1 {{ nvm_home }}/versions/node/ | sort -V | tail -1)/bin {{ nvm_home }}/versions/node/$(/bin/ls -1 {{ nvm_home }}/versions/node/ | sort -V | tail -1)/bin/{{ npm_available[tool]['check'] }}{{ "\n\n" }}
 			{%- else -%}
 			{{ "\n\t" }}&& true{{ "\n\n" }}
 			{%- endif -%}
@@ -342,17 +333,26 @@ RUN set -eux \
 {%- else -%}
 	{{ "\n\t" }}\{{ "\n" }}
 {%- endif %}
-	&& ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
 	\
-	&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
-	&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox \
-	&& rm -rf /home/devilbox/.npm \
-	&& rm -rf /home/devilbox/.cache \
-	&& rm -rf /home/devilbox/.config \
-	&& rm -rf /tmp/* \
+	&& if [ -f "{{ nvm_home }}/nvm.sh" ]; then \
+		ln -sf $(dirname $(su -c '. {{ nvm_home }}/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
+		\
+		&& su -c '. {{ nvm_home }}/nvm.sh; npm cache clear --force' devilbox \
+		&& su -c '. {{ nvm_home }}/nvm.sh; nvm cache clear --force' devilbox; \
+	fi \
+	\
+	{% for f in directory_to_clean %}
+	&& (rm -rf /home/devilbox/{{ f }} || true) \
+	{% endfor %}
+	\
+	{% for f in directory_to_clean %}
+	&& (rm -rf /root/{{ f }} || true) \
+	{% endfor %}
+	\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find {{ nvm_home }} -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -396,13 +396,21 @@ RUN set -eux \
 {%- else -%}
 	{{ "\n\t" }}\{{ "\n" }}
 {%- endif %}
-	&& rm -rf /root/.gem \
-	&& rm -rf /tmp/* \
+	\
+	{% for f in directory_to_clean %}
+	&& (rm -rf /home/devilbox/{{ f }} || true) \
+	{% endfor %}
+	\
+	{% for f in directory_to_clean %}
+	&& (rm -rf /root/{{ f }} || true) \
+	{% endfor %}
+	\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -446,13 +454,21 @@ RUN set -eux \
 {%- else -%}
 	{{ "\n\t" }}\{{ "\n" }}
 {%- endif %}
-	&& rm -rf /root/.cache/pip \
-	&& rm -rf /tmp/* \
+	\
+	{% for f in directory_to_clean %}
+	&& (rm -rf /home/devilbox/{{ f }} || true) \
+	{% endfor %}
+	\
+	{% for f in directory_to_clean %}
+	&& (rm -rf /root/{{ f }} || true) \
+	{% endfor %}
+	\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -463,7 +479,7 @@ RUN \
 		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
 		echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
 		echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
-		echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
+		echo 'PATH="{{ nvm_home }}/versions/node/$(nvm version default)/bin:${PATH}"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
@@ -545,14 +561,16 @@ RUN set -eux \
 	{%- endif -%}
 {% endfor %}{{ "\n\t" }}\
 # -------------------- Cleanup --------------------
-	&& rm -rf /home/devilbox/.cache/ \
-	&& rm -rf /home/devilbox/.config/ \
-	&& rm -rf /root/.ansible \
-	&& rm -rf /root/.console \
-	&& rm -rf /root/.composer \
-	&& rm -rf /root/.drush \
-	&& rm -rf /root/.pm2 \
-	&& rm -rf /tmp/* \
+	\
+	{% for f in directory_to_clean %}
+	&& (rm -rf /home/devilbox/{{ f }} || true) \
+	{% endfor %}
+	\
+	{% for f in directory_to_clean %}
+	&& (rm -rf /root/{{ f }} || true) \
+	{% endfor %}
+	\
+	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true)
 
 

build/ansible/group_vars/all/mods.yml

@@ -12,7 +12,7 @@
 # Extensions to enable (in defined order)
 # -------------------------------------------------------------------------------------------------
 extensions_enabled:
-  #  # ioncube must be loaded first
+  # ioncube must be loaded first
   - ioncube
   - amqp
   - apcu
@@ -94,8 +94,6 @@ extensions_enabled:
   - spl
   - sqlsrv
   - ssh2
-  # requires sockets to be installed
-  - swoole
   - sysvmsg
   - sysvsem
   - sysvshm
@@ -114,6 +112,9 @@ extensions_enabled:
   - xlswriter
   - yaml
   - zip
+  # Swoole requires php-json, php-sockets, php-curl, php-mysql (and others) to be installed
+  # https://openswoole.com/docs/get-started/prerequisites#php-extensions
+  - swoole
 
 
 # -------------------------------------------------------------------------------------------------
@@ -147,7 +148,6 @@ extensions_enabled:
 #   command:     [required] Custom command to install and enable a module
 extensions_available:
   amqp:
-    disabled: []
     5.2:
       type: pecl
       version: 1.6.1
@@ -367,7 +367,6 @@ extensions_available:
   iconv:
     already_avail: "{{ php_all_versions }}"
   igbinary:
-    disabled: []
     5.2:
       type: pecl
       version: 2.0.7
@@ -464,7 +463,7 @@ extensions_available:
       command: |
         EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \
         && if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \
-        && curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \
+        && curl -sS --fail -k https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \
         && tar xvfz ioncube.tar.gz \
         && cd ioncube \
         && cp "ioncube_loader_lin_{{ php_version }}.so" "${EXTENSION_DIR}/ioncube.so" \
@@ -549,47 +548,35 @@ extensions_available:
     5.2:
       type: pecl
       version: 2.1.0
+      run_dep: [libmemcachedutil2, libevent-2.0-5]
     5.3:
       type: pecl
       version: 2.2.0
+      run_dep: [libmemcachedutil2, libevent-2.0-5]
     5.4:
       type: pecl
       version: 2.2.0
+      run_dep: [libmemcachedutil2, libevent-2.0-5]
     5.5:
       type: pecl
       version: 2.2.0
+      run_dep: [libmemcachedutil2, libevent-2.0-5]
     5.6:
       type: pecl
       version: 2.2.0
-    7.4:
-      type: git
-      git_url: https://github.com/php-memcached-dev/php-memcached
-      git_ref: master
-      command: phpize && ./configure --enable-memcached && make -j$(getconf _NPROCESSORS_ONLN) && make install
-    8.0:
-      type: git
-      git_url: https://github.com/php-memcached-dev/php-memcached
-      git_ref: master
-      command: |
-        true \
-        # FIXME: This is a work-around to mitigate compile error with PHP 8.0
-        && sed -i'' 's/\sTSRMLS_CC//g' php_memcached_session.c \
-        && phpize \
-        && ./configure --enable-memcached \
-        && make -j$(getconf _NPROCESSORS_ONLN) \
-        && make install \
-    8.1:
-      type: git
-      git_url: https://github.com/php-memcached-dev/php-memcached
-      git_ref: master
-      command: |
-        true \
-        # FIXME: This is a work-around to mitigate compile error with PHP 8.1
-        && sed -i'' 's/\sTSRMLS_CC//g' php_memcached_session.c \
-        && phpize \
-        && ./configure --enable-memcached \
-        && make -j$(getconf _NPROCESSORS_ONLN) \
-        && make install \
+      run_dep: [libmemcachedutil2, libevent-2.0-5]
+    7.0:
+      type: pecl
+      command: printf "\n\n\nyes\nyes\nyes\n" | pecl install memcached
+      run_dep: [libmemcachedutil2, libevent-2.0-5]
+    7.1:
+      type: pecl
+      command: printf "\n\n\nyes\nyes\nyes\n" | pecl install memcached
+      run_dep: [libmemcachedutil2, libevent-2.1-6]
+    7.2:
+      type: pecl
+      command: printf "\n\n\nyes\nyes\nyes\n" | pecl install memcached
+      run_dep: [libmemcachedutil2, libevent-2.1-6]
     8.2:
       type: git
       git_url: https://github.com/php-memcached-dev/php-memcached
@@ -604,8 +591,9 @@ extensions_available:
         && make install \
     all:
       type: pecl
+      command: printf "\n\n\nyes\nyes\nyes\n" | pecl install memcached
       build_dep: [zlib1g-dev, libmemcached-dev, libevent-dev]
-      run_dep: [libmemcachedutil2]
+      run_dep: [libmemcachedutil2, libevent-2.1-7]
   mhash:
     disabled: [7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2] # Deprecated
     already_avail: [5.2, 5.3, 5.4, 5.5, 5.6]
@@ -732,9 +720,9 @@ extensions_available:
         && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \
         \
         && rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
-        && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+        && curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
         https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
-        && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+        && curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
         https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
         && alien \
           -v \
@@ -854,9 +842,9 @@ extensions_available:
         && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \
         \
         && rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
-        && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+        && curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
         https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
-        && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
+        && curl -sS -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
         https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \
         && alien \
           -v \
@@ -958,6 +946,16 @@ extensions_available:
       git_url: https://github.com/phalcon/cphalcon
       git_ref: v3.4.4
       command: cd build && ./install
+    7.2:
+      type: git
+      git_url: https://github.com/phalcon/cphalcon
+      git_ref: v4.1.1
+      command: cd build && ./install
+    7.3:
+      type: git
+      git_url: https://github.com/phalcon/cphalcon
+      git_ref: v4.1.2
+      command: cd build && ./install
     all:
       type: git
       git_url: https://github.com/phalcon/cphalcon
@@ -1159,19 +1157,19 @@ extensions_available:
       build_dep: [libssh2-1-dev]
       run_dep: [libssh2-1]
   swoole:
-    disabled: [5.2, 8.1, 8.2]
+    disabled: [5.2, 8.2]
     5.3:
       type: pecl
       version: 1.9.23
-      run_dep: [libnghttp2-5]
+      run_dep: [libc-ares2, libnghttp2-5, libssl1.0.0]
     5.4:
       type: pecl
       version: 1.9.23
-      run_dep: [libnghttp2-5]
+      run_dep: [libc-ares2, libnghttp2-5, libssl1.0.0]
     5.5:
       type: pecl
       version: 1.9.23
-      run_dep: [libnghttp2-5]
+      run_dep: [libc-ares2, libnghttp2-5, libssl1.0.0]
     5.6:
       type: pecl
       version: 1.9.23
@@ -1181,11 +1179,21 @@ extensions_available:
     7.1:
       type: pecl
       version: 4.4.26
+    7.2:
+      type: pecl
+      version: 4.8.12
+    7.3:
+      type: pecl
+      version: 4.8.12
+    7.4:
+      type: pecl
+      version: 4.8.12
     all:
       type: pecl
-      command: yes yes | pecl install swoole
-      build_dep: [libnghttp2-dev, libssl-dev]
-      run_dep: [libnghttp2-14]
+      # Note: -D is only supported from PHP 7.2+
+      command: pecl install -D 'enable-sockets="no" enable-openssl="yes" enable-http2="yes" enable-mysqlnd="yes" enable-swoole-json="no" enable-swoole-curl="yes" enable-cares="yes" with-postgres="yes"' swoole
+      build_dep: [libc-ares-dev, libnghttp2-dev, libssl-dev, libcurl4-openssl-dev]
+      run_dep: [libc-ares2, libnghttp2-14]
   sysvmsg:
     all:
       type: builtin
@@ -1263,96 +1271,18 @@ extensions_available:
       run_dep: [uuid]
       build_dep: [uuid-dev]
   vips:
-    disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 8.0, 8.1, 8.2]
-    7.0:
-      build_dep:
-        - fftw-dev
-        - gobject-introspection
-        - gtk-doc-tools
-        - libexif-dev
-        - libexpat1-dev
-        - libfftw3-dev
-        - libgif-dev
-        - libglib2.0-dev
-        - libmagick++-dev
-        - libmagickcore-6.q16-dev
-        - libmagickwand-dev
-        - libpoppler-glib-dev
-        - librsvg2-dev
-        - libtool
-        - libwebp-dev
-        - libwebpdemux2
-        - libwebpmux2
-      run_dep:
-        - fftw2
-        - gir1.2-poppler-0.18
-        - imagemagick-6.q16
-        - libexif12
-        - libexpat1
-        - libfftw3-3
-        - libgif7
-        - libglib2.0-0
-        - libmagick++-6.q16-7
-        - libmagick++-6.q16hdri-7
-        - libmagickcore-6.q16-3
-        - libmagickcore-6.q16-3-extra
-        - libmagickwand-6.q16-3
-        - libmagickwand-6.q16hdri-3
-        - libpoppler-glib8
-        - librsvg2-2
-        - libwebp6
-        - libwebpdemux2
-        - libwebpmux2
+    # vips requires PHP > 5.6
+    disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 8.2]
+    5.6:
+      type: pecl
+      version: 1.0.0
     all:
       type: pecl
-      pre: |
-        git clone https://github.com/libvips/libvips /tmp/libvips \
-        && cd /tmp/libvips \
-        && ./autogen.sh \
-        && make -j$(getconf _NPROCESSORS_ONLN) \
-        && make install \
-        && cd /tmp \
-        && rm -rf /tmp/libvips \
       build_dep:
-        - fftw-dev
-        - gobject-introspection
-        - gtk-doc-tools
-        - libexif-dev
-        - libexpat1-dev
-        - libfftw3-dev
-        - libgif-dev
-        - libglib2.0-dev
-        - libimagequant-dev
-        - libmagick++-dev
-        - libmagickcore-6.q16-dev
-        - libmagickwand-dev
-        - libpoppler-glib-dev
-        - librsvg2-dev
-        - libtool
-        - libwebp-dev
-        - libwebpdemux2
-        - libwebpmux3
+        - libvips-dev
+        - libvips42
       run_dep:
-        - fftw2
-        - gir1.2-poppler-0.18
-        - imagemagick-6.q16
-        - libexif12
-        - libexpat1
-        - libfftw3-3
-        - libgif7
-        - libglib2.0-0
-        - libimagequant0
-        - libmagick++-6.q16-8
-        - libmagick++-6.q16hdri-8
-        - libmagickcore-6.q16-6
-        - libmagickcore-6.q16-6-extra
-        - libmagickwand-6.q16-6
-        - libmagickwand-6.q16hdri-6
-        - libpoppler-glib8
-        - librsvg2-2
-        - libwebp6
-        - libwebpdemux2
-        - libwebpmux3
+        - libvips42
   wddx:
     # https://wiki.php.net/rfc/deprecate-and-remove-ext-wddx
     disabled: [7.4, 8.0, 8.1, 8.2]

build/ansible/group_vars/all/work.yml

@@ -8,11 +8,82 @@
 #
 
 
+###
+### Define operating system versions
+###
+os_release:
+  # Jessie (Ubuntu: trusty, utopic, vivid, wily)
+  5.2:
+    debian: jessie
+    ubuntu: trusty
+  5.3:
+    debian: jessie
+    ubuntu: trusty
+  5.4:
+    debian: jessie
+    ubuntu: trusty
+  5.5:
+    debian: jessie
+    ubuntu: trusty
+  # Strech (Ubuntu: xenial, yakkety, zesty, artful)
+  5.6:
+    debian: stretch
+    ubuntu: xenial
+  7.0:
+    debian: stretch
+    ubuntu: xenial
+  # Buster (Ubuntu: bionic, cosmic, disco, eoan)
+  7.1:
+    debian: buster
+    ubuntu: bionic
+  7.2:
+    debian: buster
+    ubuntu: bionic
+  # Bullseye (Ubuntu: focal, groovy, hirsute, impish)
+  7.3:
+    debian: bullseye
+    ubuntu: focal
+  7.4:
+    debian: bullseye
+    ubuntu: focal
+  8.0:
+    debian: bullseye
+    ubuntu: focal
+  8.1:
+    debian: bullseye
+    ubuntu: focal
+  8.2:
+    debian: bullseye
+    ubuntu: focal
+  all:
+    debian: bullseye
+    ubuntu: focal
+
+
 # -------------------------------------------------------------------------------------------------
 # Global variables
 # -------------------------------------------------------------------------------------------------
 composer_home: /usr/local/src/composer
-nvm_home: /usr/local/src/nvm
+nvm_home: /opt/nvm
+node_version: --lts
+
+directory_to_clean:
+  - .*json
+  - .ansible
+  - .cache
+  - .composer
+  - .config
+  - .console
+  - .drush
+  - .gem
+  - .local
+  - .node
+  - .npm
+  - .pm2
+  - .subversion
+  - .v8*
+  - node_modules
+  - yarn.lock
 
 
 # -------------------------------------------------------------------------------------------------
@@ -21,10 +92,9 @@ nvm_home: /usr/local/src/nvm
 apt_repositories_enabled:
   - backports
   - blackfire
-  - git
-  - mongo
-  - pgsql
-  - yarn
+  #- git
+  #- mongo
+  #- pgsql
 
 
 # -------------------------------------------------------------------------------------------------
@@ -73,7 +143,7 @@ npm_enabled:
 # Python pip packages to install
 # -------------------------------------------------------------------------------------------------
 pip_enabled:
-  - ansible
+  #- ansible
   - yamllint
   - yq
 
@@ -86,6 +156,9 @@ software_enabled:
   - composer
   - pip
   - nvm
+  # Required for internal Devilbox connection
+  - pgsql_client
+  - mongo_client
   # Normal packages start here
   - awesomeci
   - deployer
@@ -94,10 +167,9 @@ software_enabled:
   - drush9
   - drupalconsole
   - gitflow
-  - homebrew
+  #- homebrew
   - laravel
   - linkcheck
-  # - linuxbrew
   - mhsendmail
   - mysqldumpsecure
   - phalcon
@@ -109,8 +181,6 @@ software_enabled:
   - symfony
   - wkhtmltopdf
   - wpcli
-  # Cleanup needs to be last
-  - cleanup
 
 
 # -------------------------------------------------------------------------------------------------
@@ -127,90 +197,152 @@ software_enabled:
 #   pre:       [optional] Run custom command to add gpg key for repository
 #
 apt_repositories_available:
+  ###
+  ### Backports
+  ###
   backports:
+    # [Jessie]
     5.2:
       pre: echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until
-      deb: deb http://archive.debian.org/debian jessie-backports main
+      deb: deb [trusted=yes] http://archive.debian.org/debian {{ os_release[5.2].debian }}-backports main
+    # [Jessie]
     5.3:
       pre: echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until
-      deb: deb http://archive.debian.org/debian jessie-backports main
+      deb: deb [trusted=yes] http://archive.debian.org/debian {{ os_release[5.3].debian }}-backports main
+    # [Jessie]
     5.4:
       pre: echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until
-      deb: deb http://archive.debian.org/debian jessie-backports main
+      deb: deb [trusted=yes] http://archive.debian.org/debian {{ os_release[5.4].debian }}-backports main
+    # [Jessie]
     5.5:
       pre: echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until
-      deb: deb http://archive.debian.org/debian jessie-backports main
+      deb: deb [trusted=yes] http://archive.debian.org/debian {{ os_release[5.5].debian }}-backports main
+    # [Stretch]
+    5.6:
+      pre: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138
+      deb: deb http://ftp.debian.org/debian {{ os_release[5.6].debian }}-backports main
+    # [Stretch]
+    7.0:
+      pre: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138
+      deb: deb http://ftp.debian.org/debian {{ os_release[7.0].debian }}-backports main
+    # [Buster]
+    7.1:
+      pre: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138
+      deb: deb http://ftp.debian.org/debian {{ os_release[7.1].debian }}-backports main
+    # [Buster]
+    7.2:
+      pre: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138
+      deb: deb http://ftp.debian.org/debian {{ os_release[7.2].debian }}-backports main
+    # [Bullseye]
     all:
       pre: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138
-      deb: deb http://ftp.debian.org/debian stretch-backports main
+      deb: deb http://ftp.debian.org/debian {{ os_release['all'].debian }}-backports main
+  ###
+  ### Blackfire
+  ###
   blackfire:
     all:
       deb: deb http://packages.blackfire.io/debian any main
       pre: curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+  ###
+  ### Git (currently obsolete)
+  ###
   git:
-    7.2:
-      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main
-    7.3:
-      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main
-    7.4:
-      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main
-    8.0:
-      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main
-    8.1:
-      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main
-    8.2:
-      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main
-    all:
-      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main
-      key: A1715D88E1DF1F24
-  # Get keys
-  # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-3.6.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g'
-  mongo:
     5.2:
-      # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-3.6.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g'
-      deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main
-      key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[5.2].ubuntu }} main
     5.3:
-      deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main
-      key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[5.3].ubuntu }} main
     5.4:
-      deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main
-      key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[5.4].ubuntu }} main
     5.5:
-      deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main
-      key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5
-    all:
-      # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-4.0.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g'
-      deb: deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main
-      key: 9DA31620334BD75D9DCB49F368818C72E52529D4
-  pgsql:
-    5.2:
-      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main
-    5.3:
-      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main
-    5.4:
-      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main
-    5.5:
-      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[5.5].ubuntu }} main
     5.6:
-      deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main
-      pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[5.6].ubuntu }} main
     7.0:
-      deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main
-      pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[7.0].ubuntu }} main
     7.1:
-      deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main
-      pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[7.1].ubuntu }} main
     7.2:
-      deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main
-      pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[7.2].ubuntu }} main
+    7.3:
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[7.3].ubuntu }} main
+    7.4:
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[7.4].ubuntu }} main
+    8.0:
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[8.0].ubuntu }} main
+    8.1:
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[8.1].ubuntu }} main
+    8.2:
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[8.2].ubuntu }} main
     all:
-      deb: deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main
-      pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
-  yarn:
+      key: A1715D88E1DF1F24
+  ###
+  ### MongoDB (currently obsolete)
+  ###
+  mongo:
+    # 5.2: mongodb-clients (amd64)
+    # 5.3: mongodb-clients (amd64)
+    # 5.4: mongodb-clients (amd64)
+    # 5.5: mongodb-clients (amd64)
+    # 5.6: mongodb-clients & mongo-tools (amd64, arm64)
+    # 7.0: mongodb-clients & mongo-tools (amd64, arm64)
+    # 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+    # 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+    # 7.3: mongodb-org-(tools|shell) (amd64, arm64)
+    # 7.4: mongodb-org-(tools|shell) (amd64, arm64)
+    # 8.0: mongodb-org-(tools|shell) (amd64, arm64)
+    # 8.1: mongodb-org-(tools|shell) (amd64, arm64)
+    # 8.2: mongodb-org-(tools|shell) (amd64, arm64)
+    disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0]
+    # [Buster] Ubuntu repository required for arm64 support instead
+    7.1:
+      # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-4.4.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g'
+      deb: deb http://repo.mongodb.org/apt/ubuntu {{ os_release[7.1].ubuntu }}/mongodb-org/4.4 multiverse
+      key: 20691EEC35216C63CAF66CE1656408E390CFB1F5
+    # [Buster] Ubuntu repository required for arm64 support instead
+    7.2:
+      # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-4.4.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g'
+      deb: deb http://repo.mongodb.org/apt/ubuntu {{ os_release[7.2].ubuntu }}/mongodb-org/4.4 multiverse
+      key: 20691EEC35216C63CAF66CE1656408E390CFB1F5
+    # [Bullseye] Ubuntu repository required for arm64 support instead
     all:
-      deb: deb http://dl.yarnpkg.com/debian/ stable main
-      pre: curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+      # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-4.4.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g'
+      deb: deb http://repo.mongodb.org/apt/ubuntu {{ os_release['all'].ubuntu }}/mongodb-org/4.4 multiverse
+      key: 20691EEC35216C63CAF66CE1656408E390CFB1F5
+  ###
+  ### PostgrSQL (currently obsolete)
+  ###
+  pgsql:
+    # [Jessie]
+    5.2:
+      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[5.2].debian }}-pgdg main
+    # [Jessie]
+    5.3:
+      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[5.3].debian }}-pgdg main
+    # [Jessie]
+    5.4:
+      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[5.4].debian }}-pgdg main
+    # [Jessie]
+    5.5:
+      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[5.5].debian }}-pgdg main
+    # [Stretch]
+    5.6:
+      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[5.6].debian }}-pgdg main
+    # [Stretch]
+    7.0:
+      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[7.0].debian }}-pgdg main
+    # [Buster]
+    7.1:
+      deb: deb http://apt.postgresql.org/pub/repos/apt/ {{ os_release[7.1].debian }}-pgdg main
+      pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+    # [Buster]
+    7.2:
+      deb: deb http://apt.postgresql.org/pub/repos/apt/ {{ os_release[7.2].debian }}-pgdg main
+      pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+    # [Bullseye]
+    all:
+      deb: deb http://apt.postgresql.org/pub/repos/apt/ {{ os_release['all'].debian }}-pgdg main
+      pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
 
 
 # -------------------------------------------------------------------------------------------------
@@ -419,14 +551,44 @@ software_available:
   # Composer is a dependency for others
   composer:
     disabled: [5.2]
-    check: composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+'
+    check: composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+'
+    5.3:
+      pre: |
+        COMPOSER_1_VERSION="latest-1.x" \
+        && COMPOSER_2_VERSION="latest-2.2.x" \
+      post: |
+        ln -sf /usr/local/bin/composer-1 /usr/local/bin/composer \
+    5.4:
+      pre: |
+        COMPOSER_1_VERSION="latest-1.x" \
+        && COMPOSER_2_VERSION="latest-2.2.x" \
+    5.5:
+      pre: |
+        COMPOSER_1_VERSION="latest-1.x" \
+        && COMPOSER_2_VERSION="latest-2.2.x" \
+    5.6:
+      pre: |
+        COMPOSER_1_VERSION="latest-1.x" \
+        && COMPOSER_2_VERSION="latest-2.2.x" \
+    7.0:
+      pre: |
+        COMPOSER_1_VERSION="latest-1.x" \
+        && COMPOSER_2_VERSION="latest-2.2.x" \
+    7.1:
+      pre: |
+        COMPOSER_1_VERSION="latest-1.x" \
+        && COMPOSER_2_VERSION="latest-2.2.x" \
     all:
+      pre: |
+        COMPOSER_1_VERSION="latest-1.x" \
+        && COMPOSER_2_VERSION="latest-2.x" \
       command: |
-        curl -sS -L --fail https://getcomposer.org/composer-1.phar > /usr/local/bin/composer-1 \
-        && curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
+        curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \
+        && curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \
         && chmod +x /usr/local/bin/composer-1 \
         && chmod +x /usr/local/bin/composer-2 \
-        && ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+      post: |
+        ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
   # pip is a dependency for others
   pip:
     5.2:
@@ -513,25 +675,249 @@ software_available:
         && curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python3 \
   # nvm is a dependency for others
   nvm:
-    check: su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+'
+    check: |
+      su  -c '. {{ nvm_home }}/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+      && su  -c '. {{ nvm_home }}/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+    5.2:
+      pre: |
+        NODE_VERSION="17" \
+    5.3:
+      pre: |
+        NODE_VERSION="17" \
+    5.4:
+      pre: |
+        NODE_VERSION="17" \
+    5.5:
+      pre: |
+        NODE_VERSION="17" \
+    5.6:
+      pre: |
+        NODE_VERSION="17" \
+    7.0:
+      pre: |
+        NODE_VERSION="17" \
     all:
       pre: |
-        git clone https://github.com/creationix/nvm /opt/nvm \
-        && cd /opt/nvm \
-        && git checkout "$(git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1))" \
+        NODE_VERSION="{{ node_version }}" \
+      command: |
+        NVM_VERSION="$( \
+          curl -sS 'https://github.com/nvm-sh/nvm/releases' \
+          | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
+          | grep -Eo 'v?[.0-9]+' \
+          | sort -V \
+          | tail -1 \
+        )" \
+        && mkdir -p {{ nvm_home }} \
+        && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
+          | NVM_DIR="{{ nvm_home }}" bash \
         \
         && { \
-          echo 'export NVM_DIR="/opt/nvm"'; \
+          echo 'export NVM_DIR="{{ nvm_home }}"'; \
           echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm'; \
           echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion'; \
         } >> /home/devilbox/.bashrc \
         \
-        && chown -R devilbox:devilbox /opt/nvm \
-      # Install latest and LTS version
+        && chown -R devilbox:devilbox "{{ nvm_home }}" \
+      # Install latest and LTS version and yarn
+      post: |
+        su  -c ". {{ nvm_home }}/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
+        && su  -c ". {{ nvm_home }}/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
+        && su  -c ". {{ nvm_home }}/nvm.sh; corepack enable" devilbox \
+        \
+        && chmod 0777 {{ nvm_home }} \
+        && find {{ nvm_home }} -type f -print0 | xargs -n1 -0 chmod go+w \
+        && find {{ nvm_home }} -type d -print0 | xargs -n1 -0 chmod 0777 \
+  ###
+  ### PostgrSQL Command line client
+  ###
+  # 5.2: (amd64)
+  # 5.3: (amd64)
+  # 5.4: (amd64)
+  # 5.5: (amd64)
+  # 5.6: (amd64)
+  # 7.0: (amd64)
+  # 7.1: (amd64, arm64)
+  # 7.2: (amd64, arm64)
+  # 7.3: (amd64, arm64)
+  # 7.4: (amd64, arm64)
+  # 8.0: (amd64, arm64)
+  # 8.1: (amd64, arm64)
+  # 8.2: (amd64, arm64)
+  pgsql_client:
+    check: |
+      if echo '{{ php_version }}' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+        pg_isready --version; \
+        fi \
+      else \
+        pg_isready --version; \
+      fi \
+    5.2:
+      pre: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+          && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[php_version].debian }}-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+          && apt-get update; \
+        fi \
       command: |
-        su  -c '. /opt/nvm/nvm.sh; nvm install node' devilbox \
-        && su  -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
-        && su  -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            postgresql-client; \
+        fi \
+    5.3:
+      pre: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+          && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[php_version].debian }}-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+          && apt-get update; \
+        fi \
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            postgresql-client; \
+        fi \
+    5.4:
+      pre: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+          && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[php_version].debian }}-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+          && apt-get update; \
+        fi \
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            postgresql-client; \
+        fi \
+    5.5:
+      pre: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+          && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[php_version].debian }}-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+          && apt-get update; \
+        fi \
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            postgresql-client; \
+        fi \
+    5.6:
+      pre: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+          && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[php_version].debian }}-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+          && apt-get update; \
+        fi \
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            postgresql-client; \
+        fi \
+    7.0:
+      pre: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+          && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[php_version].debian }}-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+          && apt-get update; \
+        fi \
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            postgresql-client; \
+        fi \
+    all:
+      pre: |
+        curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+        && echo "deb http://apt.postgresql.org/pub/repos/apt/ {{ os_release[php_version].debian }}-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+        && apt-get update \
+      command: |
+        apt-get install -y --no-install-recommends --no-install-suggests \
+          postgresql-client \
+      post: rm -rf /var/lib/apt/lists/*
+  ###
+  ### MongoDB Command line client
+  ###
+  # 5.2: mongodb-clients (amd64)
+  # 5.3: mongodb-clients (amd64)
+  # 5.4: mongodb-clients (amd64)
+  # 5.5: mongodb-clients (amd64)
+  # 5.6: mongodb-clients & mongo-tools (amd64, arm64)
+  # 7.0: mongodb-clients & mongo-tools (amd64, arm64)
+  # 7.1: mongodb-org-(tools|shell) (amd64, arm64)
+  # 7.2: mongodb-org-(tools|shell) (amd64, arm64)
+  # 7.3: mongodb-org-(tools|shell) (amd64, arm64)
+  # 7.4: mongodb-org-(tools|shell) (amd64, arm64)
+  # 8.0: mongodb-org-(tools|shell) (amd64, arm64)
+  # 8.1: mongodb-org-(tools|shell) (amd64, arm64)
+  # 8.2: mongodb-org-(tools|shell) (amd64, arm64)
+  mongo_client:
+    check: |
+      if echo '{{ php_version }}' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          mongofiles --version; \
+        fi \
+      else \
+        mongofiles --version; \
+      fi \
+    5.2:
+      pre: apt-get update
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            mongodb-clients; \
+        fi \
+    5.3:
+      pre: apt-get update
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            mongodb-clients; \
+        fi \
+    5.4:
+      pre: apt-get update
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            mongodb-clients; \
+        fi \
+    5.5:
+      pre: apt-get update
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            mongodb-clients; \
+        fi \
+    5.6:
+      pre: apt-get update
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            mongodb-clients \
+            mongo-tools; \
+        else \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            mongodb-clients; \
+        fi \
+    7.0:
+      pre: apt-get update
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            mongodb-clients \
+            mongo-tools; \
+        else \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            mongodb-clients; \
+        fi \
+    all:
+      pre: |
+        APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+        && echo "deb http://repo.mongodb.org/apt/ubuntu {{ os_release[php_version].ubuntu }}/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+        && apt-get update \
+      command: |
+        apt-get install -y --no-install-recommends --no-install-suggests \
+          mongodb-org-tools \
+          mongodb-org-shell \
+      post: rm -rf /var/lib/apt/lists/*
   awesomeci:
     check: regex-grep --version | grep -E '[0-9][.0-9]+'
     all:
@@ -624,7 +1010,7 @@ software_available:
     7.1:
       pre: DURL="https://github.com/hechoendrupal/drupal-console-launcher/releases/download/1.9.4/drupal.phar"
     all:
-      pre: DURL="https://github.com$(curl -sS 'https://github.com/hechoendrupal/drupal-console-launcher/releases' | grep -Eo 'href="/.+drupal.phar"' | head -1 | sed 's/^href="//g' | sed 's/"$//g')"
+      pre: DURL="$(curl -s https://api.github.com/repos/hechoendrupal/drupal-console-launcher/releases/latest | awk -F\" '/download.*.phar/{print $(NF-1)}' | head -1)"
       command: curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal
       post: chmod +x /usr/local/bin/drupal
   gitflow:
@@ -709,25 +1095,14 @@ software_available:
       command: |
         curl -sS -L --fail https://raw.githubusercontent.com/cytopia/linkcheck/master/linkcheck > /usr/local/bin/linkcheck \
         && chmod +x /usr/local/bin/linkcheck \
-  linuxbrew:
-    check: su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[0-9][.0-9]+'
-    all:
-      command: |
-        git clone https://github.com/Linuxbrew/brew.git /usr/local/src/linuxbrew \
-        && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/linuxbrew \
-        && v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-            'echo "PATH=/usr/local/src/linuxbrew/bin:/usr/local/src/linuxbrew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \
-        && v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-            'echo "export MANPATH=/usr/local/src/linuxbrew/share/man:${MANPATH}"   >> /home/devilbox/${v}' \
-        && v="${BASH_PROFILE}" su ${MY_USER} -c -p \
-            'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \
-        && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \
   mhsendmail:
     all:
       command: |
-        curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
-        && chmod +x mhsendmail_linux_amd64 \
-        && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
+        if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+          curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \
+          && chmod +x mhsendmail_linux_amd64 \
+          && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \
+        fi \
   mysqldumpsecure:
     check: mysqldump-secure --version | grep -E 'Version:\s*[0-9][.0-9]+'
     all:
@@ -753,7 +1128,7 @@ software_available:
         && cd / \
         && rm -rf /usr/local/src/mysqldump-secure \
   phalcon:
-    disabled: [5.2, 8.0, 8.1, 8.2]
+    disabled: [5.2, 7.4, 8.0, 8.1, 8.2]
     check: phalcon commands | grep -E '[0-9][.0-9]+'
     5.3:
       pre: |
@@ -942,77 +1317,95 @@ software_available:
         && chmod +x /usr/local/bin/phpunit \
   symfony:
     disabled: [5.2, 5.3]
-    check: symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+'
+    check: symfony -V | grep -Ei 'version\s[0-9][.0-9]+'
     all:
-      pre: SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )"
-      command: curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony
-      post: chmod +x /usr/local/bin/symfony
+      pre: VERSION="$(curl -s https://api.github.com/repos/symfony-cli/symfony-cli/releases/latest | awk -F\" '/symfony-cli_.*._amd64\.deb/{print $(NF-1)}' | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')"
+      command: |
+        curl -sS -L --fail -o /tmp/symfonycli.deb  https://github.com/symfony-cli/symfony-cli/releases/download/v${VERSION}/symfony-cli_${VERSION}_$(dpkg-architecture --query DEB_HOST_ARCH).deb \
+        && dpkg -i /tmp/symfonycli.deb \
+        && rm -f /tmp/symfonycli.deb \
   wkhtmltopdf:
-    check: wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)"
+    check: if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)"; fi
     5.2:
-      pre: VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )"
+      pre: VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/wkhtmltopdf/releases | awk -F\" '/wkhtmltopdf.*.jessie_amd64\.deb/{print $(NF-1)}' | head -1 )"
       command: |
-        DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-        && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-          libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
-        && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
-        && dpkg -i /tmp/wkhtmltopdf.deb \
-        && rm -f /tmp/wkhtmltopdf.deb \
+        if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+          DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+          && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+            libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+          && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  ${VERSION} \
+          && dpkg -i /tmp/wkhtmltopdf.deb \
+          && rm -f /tmp/wkhtmltopdf.deb; \
+        fi \
     5.3:
-      pre: VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )"
+      pre: VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/wkhtmltopdf/releases | awk -F\" '/wkhtmltopdf.*.jessie_amd64\.deb/{print $(NF-1)}' | head -1 )"
       command: |
-        DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-        && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-          libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
-        && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
-        && dpkg -i /tmp/wkhtmltopdf.deb \
-        && rm -f /tmp/wkhtmltopdf.deb \
+        if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+          DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+          && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+            libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+          && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  ${VERSION} \
+          && dpkg -i /tmp/wkhtmltopdf.deb \
+          && rm -f /tmp/wkhtmltopdf.deb; \
+        fi \
     5.4:
-      pre: VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )"
+      pre: VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/wkhtmltopdf/releases | awk -F\" '/wkhtmltopdf.*.jessie_amd64\.deb/{print $(NF-1)}' | head -1 )"
       command: |
-        DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-        && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-          libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
-        && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
-        && dpkg -i /tmp/wkhtmltopdf.deb \
-        && rm -f /tmp/wkhtmltopdf.deb \
+        if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+          DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+          && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+            libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+          && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  ${VERSION} \
+          && dpkg -i /tmp/wkhtmltopdf.deb \
+          && rm -f /tmp/wkhtmltopdf.deb; \
+        fi \
     5.5:
-      pre: VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )"
+      pre: VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/wkhtmltopdf/releases | awk -F\" '/wkhtmltopdf.*.jessie_amd64\.deb/{print $(NF-1)}' | head -1 )"
       command: |
-        DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-        && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-          libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
-        && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
-        && dpkg -i /tmp/wkhtmltopdf.deb \
-        && rm -f /tmp/wkhtmltopdf.deb \
+        if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+          DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+          && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+            libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+          && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  ${VERSION} \
+          && dpkg -i /tmp/wkhtmltopdf.deb \
+          && rm -f /tmp/wkhtmltopdf.deb; \
+        fi \
     5.6:
       command: |
-        DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-        && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-          libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
-        && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
-        && dpkg -i /tmp/wkhtmltopdf.deb \
-        && rm -f /tmp/wkhtmltopdf.deb \
+        if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+          DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+          && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+            libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+          && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  ${VERSION} \
+          && dpkg -i /tmp/wkhtmltopdf.deb \
+          && rm -f /tmp/wkhtmltopdf.deb; \
+        fi \
     7.0:
       command: |
-        DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-        && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-          libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
-        && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
-        && dpkg -i /tmp/wkhtmltopdf.deb \
-        && rm -f /tmp/wkhtmltopdf.deb \
+        if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+          DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+          && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+            libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+          && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  ${VERSION} \
+          && dpkg -i /tmp/wkhtmltopdf.deb \
+          && rm -f /tmp/wkhtmltopdf.deb; \
+        fi \
     all:
-      pre: VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )"
+      pre: VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases | awk -F\" '/wkhtmltopdf.*.stretch_amd64\.deb/{print $(NF-1)}' | head -1 )"
       command: |
-        DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-        && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-          libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
-        && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
-        && dpkg -i /tmp/wkhtmltopdf.deb \
-        && rm -f /tmp/wkhtmltopdf.deb \
+        if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+          DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+          && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+            libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+          && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  ${VERSION} \
+          && dpkg -i /tmp/wkhtmltopdf.deb \
+          && rm -f /tmp/wkhtmltopdf.deb; \
+        fi \
       post: |
-        DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-        && rm -rf /var/lib/apt/lists/* \
+        if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+          DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+          && rm -rf /var/lib/apt/lists/*; \
+        fi \
   wpcli:
     disabled: [5.2]
     check: wp --allow-root --version | grep -E '[0-9][.0-9]+'
@@ -1028,24 +1421,3 @@ software_available:
     all:
       command: curl -sS -L --fail https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp
       post: chmod +x /usr/local/bin/wp
-  cleanup:
-    all:
-      command: |
-        rm -rf /home/${MY_USER}/.*json \
-        && rm -rf /home/${MY_USER}/.cache \
-        && rm -rf /home/${MY_USER}/.composer \
-        && rm -rf /home/${MY_USER}/.config \
-        && rm -rf /home/${MY_USER}/.drush \
-        && rm -rf /home/${MY_USER}/.subversion \
-        && rm -rf /home/${MY_USER}/.v8* \
-        \
-        && rm -rf /root/.*json \
-        && rm -rf /root/.cache \
-        && rm -rf /root/.composer \
-        && rm -rf /root/.config \
-        && rm -rf /root/.drush \
-        && rm -rf /root/.subversion \
-        && rm -rf /root/.v8* \
-        \
-        && rm -rf /tmp/* \
-        && (rm -rf /tmp/.* || true) \

build/gen-readme.sh

@@ -8,27 +8,18 @@ set -o pipefail
 # Get absolute directory of this script
 CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
 
-ARCH="${1:-linux/amd64}"
+IMAGE="${1}"
+ARCH="${2}"
+TAG_BASE="${3}"
+TAG_MODS="${4}"
+VERSION="${5:-}"
 
 
 ###
 ### Show Usage
 ###
 print_usage() {
-	echo "Usage: gen-readme.sh [<ARCH>]"
-	echo "       gen-readme.sh <ARCH> 5.2"
-	echo "       gen-readme.sh <ARCH> 5.3"
-	echo "       gen-readme.sh <ARCH> 5.4"
-	echo "       gen-readme.sh <ARCH> 5.5"
-	echo "       gen-readme.sh <ARCH> 5.6"
-	echo "       gen-readme.sh <ARCH> 7.0"
-	echo "       gen-readme.sh <ARCH> 7.1"
-	echo "       gen-readme.sh <ARCH> 7.2"
-	echo "       gen-readme.sh <ARCH> 7.3"
-	echo "       gen-readme.sh <ARCH> 7.4"
-	echo "       gen-readme.sh <ARCH> 8.0"
-	echo "       gen-readme.sh <ARCH> 8.1"
-	echo "       gen-readme.sh <ARCH> 8.2"
+	echo "Usage: gen-readme.sh <IMAGE> <ARCH> <TAG_BASE> <TAG_MODS> [<VERSION>]"
 }
 
 
@@ -36,25 +27,24 @@ print_usage() {
 ### Extract PHP modules in alphabetical order and comma separated in one line
 ###
 get_modules() {
-	tag="${1}"
-
+	current_tag="${1}"
 	# Retrieve all modules
-	PHP_MODULES="$( docker run --rm --platform "${ARCH}" $(tty -s && echo '-it' || echo) --entrypoint=php devilbox/php-fpm:${tag} -m )"
+	PHP_MODULES="$( docker run --rm --platform "${ARCH}" "$(tty -s && echo '-it' || echo)" --entrypoint=php "${IMAGE}:${current_tag}" -m )"
 	ALL_MODULES=
 
-	if docker run --rm --platform "${ARCH}" $(tty -s && echo '-it' || echo) --entrypoint=find devilbox/php-fpm:${tag} /usr/local/lib/php/extensions -name 'ioncube.so' | grep -q ioncube.so; then
+	if docker run --rm --platform "${ARCH}" "$(tty -s && echo '-it' || echo)" --entrypoint=find "${IMAGE}:${current_tag}" /usr/local/lib/php/extensions -name 'ioncube.so' | grep -q ioncube.so; then
 		ALL_MODULES="${ALL_MODULES},ioncube";
 	fi
 
-	if docker run --rm --platform "${ARCH}" $(tty -s && echo '-it' || echo) --entrypoint=find devilbox/php-fpm:${tag} /usr/local/lib/php/extensions -name 'blackfire.so' | grep -q blackfire.so; then
+	if docker run --rm --platform "${ARCH}" "$(tty -s && echo '-it' || echo)" --entrypoint=find "${IMAGE}:${current_tag}" /usr/local/lib/php/extensions -name 'blackfire.so' | grep -q blackfire.so; then
 		ALL_MODULES="${ALL_MODULES},blackfire";
 	fi
 
-	if docker run --rm --platform "${ARCH}" $(tty -s && echo '-it' || echo) --entrypoint=find devilbox/php-fpm:${tag} /usr/local/lib/php/extensions -name 'psr.so' | grep -q psr.so; then
+	if docker run --rm --platform "${ARCH}" "$(tty -s && echo '-it' || echo)" --entrypoint=find "${IMAGE}:${current_tag}" /usr/local/lib/php/extensions -name 'psr.so' | grep -q psr.so; then
 		ALL_MODULES="${ALL_MODULES},psr";
 	fi
 
-	if docker run --rm --platform "${ARCH}" $(tty -s && echo '-it' || echo) --entrypoint=find devilbox/php-fpm:${tag} /usr/local/lib/php/extensions -name 'phalcon.so' | grep -q phalcon.so; then
+	if docker run --rm --platform "${ARCH}" "$(tty -s && echo '-it' || echo)" --entrypoint=find "${IMAGE}:${current_tag}" /usr/local/lib/php/extensions -name 'phalcon.so' | grep -q phalcon.so; then
 		ALL_MODULES="${ALL_MODULES},phalcon";
 	fi
 
@@ -85,15 +75,15 @@ get_modules() {
 update_readme() {
 	v="${1}"
 	# Those sections must exist in README.md, otherwise this script will exit with errors
-	sed -i'' "s|<td id=\"${v//.}-base\">.*<\/td>|<td id=\"${v//.}-base\">$( get_modules "${v}-base" )<\/td>|g" "${CWD}/../README.md"
-	sed -i'' "s|<td id=\"${v//.}-mods\">.*<\/td>|<td id=\"${v//.}-mods\">$( get_modules "${v}-mods" )<\/td>|g" "${CWD}/../README.md"
+	sed -i'' "s|<td id=\"${v//.}-base\">.*<\/td>|<td id=\"${v//.}-base\">$( get_modules "${TAG_BASE}" )<\/td>|g" "${CWD}/../README.md"
+	sed -i'' "s|<td id=\"${v//.}-mods\">.*<\/td>|<td id=\"${v//.}-mods\">$( get_modules "${TAG_MODS}" )<\/td>|g" "${CWD}/../README.md"
 }
 
 
 ###
 ### Entrypoint
 ###
-if [ "${#}" -eq "0" ] || [ "${#}" -eq "1" ]; then
+if [ "${VERSION}" = "" ]; then
 	# Update PHP modules for all versions at once
 	update_readme "5.2"
 	update_readme "5.3"
@@ -108,31 +98,26 @@ if [ "${#}" -eq "0" ] || [ "${#}" -eq "1" ]; then
 	update_readme "8.0"
 	update_readme "8.1"
 	update_readme "8.2"
-elif [ "${#}" -gt "2" ]; then
-	# Specifying more than 1 argument is wrong
-	echo "Error, invalid number of arguments."
-	print_usage
-	exit 1
 else
-	if [ "${2}" != "5.2" ] \
-	&& [ "${2}" != "5.3" ] \
-	&& [ "${2}" != "5.4" ] \
-	&& [ "${2}" != "5.5" ] \
-	&& [ "${2}" != "5.6" ] \
-	&& [ "${2}" != "7.0" ] \
-	&& [ "${2}" != "7.1" ] \
-	&& [ "${2}" != "7.2" ] \
-	&& [ "${2}" != "7.3" ] \
-	&& [ "${2}" != "7.4" ] \
-	&& [ "${2}" != "8.0" ] \
-	&& [ "${2}" != "8.1" ] \
-	&& [ "${2}" != "8.2" ]; then
+	if [ "${VERSION}" != "5.2" ] \
+	&& [ "${VERSION}" != "5.3" ] \
+	&& [ "${VERSION}" != "5.4" ] \
+	&& [ "${VERSION}" != "5.5" ] \
+	&& [ "${VERSION}" != "5.6" ] \
+	&& [ "${VERSION}" != "7.0" ] \
+	&& [ "${VERSION}" != "7.1" ] \
+	&& [ "${VERSION}" != "7.2" ] \
+	&& [ "${VERSION}" != "7.3" ] \
+	&& [ "${VERSION}" != "7.4" ] \
+	&& [ "${VERSION}" != "8.0" ] \
+	&& [ "${VERSION}" != "8.1" ] \
+	&& [ "${VERSION}" != "8.2" ]; then
 		# Argument does not match any of the PHP versions
 		echo "Error, invalid argument."
 		print_usage
 		exit 1
 	else
 		# Update PHP modules for one specific PHP version
-		update_readme "${2}"
+		update_readme "${VERSION}"
 	fi
 fi

tests/.lib.sh

@@ -10,11 +10,11 @@ set -o pipefail
 ###
 function run() {
 	local cmd="${1}"
-	local to_stderr=0
+	local to_stdout=0
 
-	# Output to stderr instead?
+	# Output to stdout instead?
 	if [ "${#}" -eq "2" ]; then
-		to_stderr="${2}"
+		to_stdout="${2}"
 	fi
 
 	local red="\033[0;31m"
@@ -22,24 +22,24 @@ function run() {
 	local yellow="\033[0;33m"
 	local reset="\033[0m"
 
-	if [ "${to_stderr}" -eq "0" ]; then
-		printf "${yellow}[%s] ${red}%s \$ ${green}${cmd}${reset}\n" "$(hostname)" "$(whoami)"
-	else
+	if [ "${to_stdout}" -eq "0" ]; then
 		printf "${yellow}[%s] ${red}%s \$ ${green}${cmd}${reset}\n" "$(hostname)" "$(whoami)" >&2
+	else
+		printf "${yellow}[%s] ${red}%s \$ ${green}${cmd}${reset}\n" "$(hostname)" "$(whoami)"
 	fi
 
 	if sh -c "${cmd}"; then
-		if [ "${to_stderr}" -eq "0" ]; then
-			printf "${green}[%s]${reset}\n" "OK"
-		else
+		if [ "${to_stdout}" -eq "0" ]; then
 			printf "${green}[%s]${reset}\n" "OK" >&2
+		else
+			printf "${green}[%s]${reset}\n" "OK"
 		fi
 		return 0
 	else
-		if [ "${to_stderr}" -eq "0" ]; then
-			printf "${red}[%s]${reset}\n" "NO"
-		else
+		if [ "${to_stdout}" -eq "0" ]; then
 			printf "${red}[%s]${reset}\n" "NO" >&2
+		else
+			printf "${red}[%s]${reset}\n" "NO"
 		fi
 		return 1
 	fi
@@ -49,11 +49,11 @@ function run() {
 ###
 function run_fail() {
 	local cmd="${1}"
-	local to_stderr=0
+	local to_stdout=0
 
-	# Output to stderr instead?
+	# Output to stdout instead?
 	if [ "${#}" -eq "2" ]; then
-		to_stderr="${2}"
+		to_stdout="${2}"
 	fi
 
 	local red="\033[0;31m"
@@ -61,29 +61,51 @@ function run_fail() {
 	local yellow="\033[0;33m"
 	local reset="\033[0m"
 
-	if [ "${to_stderr}" -eq "0" ]; then
-		printf "${yellow}[%s] ${red}%s \$ ${yellow}[NOT] ${green}${cmd}${reset}\n" "$(hostname)" "$(whoami)"
-	else
+	if [ "${to_stdout}" -eq "0" ]; then
 		printf "${yellow}[%s] ${red}%s \$ ${yellow}[NOT] ${green}${cmd}${reset}\n" "$(hostname)" "$(whoami)" >&2
+	else
+		printf "${yellow}[%s] ${red}%s \$ ${yellow}[NOT] ${green}${cmd}${reset}\n" "$(hostname)" "$(whoami)"
 	fi
 
 	if ! sh -c "${cmd}"; then
-		if [ "${to_stderr}" -eq "0" ]; then
-			printf "${green}[%s]${reset}\n" "OK"
-		else
+		if [ "${to_stdout}" -eq "0" ]; then
 			printf "${green}[%s]${reset}\n" "OK" >&2
+		else
+			printf "${green}[%s]${reset}\n" "OK"
 		fi
 		return 0
 	else
-		if [ "${to_stderr}" -eq "0" ]; then
-			printf "${red}[%s]${reset}\n" "NO"
-		else
+		if [ "${to_stdout}" -eq "0" ]; then
 			printf "${red}[%s]${reset}\n" "NO" >&2
+		else
+			printf "${red}[%s]${reset}\n" "NO"
 		fi
 		return 1
 	fi
 }
 
+
+###
+### Print H2
+###
+function print_h2() {
+	local text="${1}"
+
+	local red="\033[0;31m"
+	local green="\033[0;32m"
+	local yellow="\033[0;33m"
+	local purple="\033[0;35m"
+	local reset="\033[0m"
+
+	echo
+	echo
+	printf "${purple}%s${reset}\n" "###"
+	printf "${purple}%s${reset}\n" "### ${text}"
+	printf "${purple}%s${reset}\n" "###"
+	echo
+}
+
+
 ###
 ### Get 15 character random word
 ###
@@ -93,8 +115,8 @@ function get_random_name() {
 	local name=
 
 	for i in {1..15}; do
-		rand="$( shuf -i 0-${len} -n 1 )"
-		rand=$(( rand - 1 ))
+		rand="$( shuf -i "0-${len}" -n 1 )"
+		rand="$(( rand - 1 ))"
 		name="${name}${chr[$rand]}"
 		i="${i}" # simply to get rid of shellcheck complaints
 	done
@@ -107,22 +129,34 @@ function get_random_name() {
 ###
 function docker_run() {
 	local image_name="${1}"
-
+	local architecture="${2}"
 	shift
+	shift
+
 	local args="${*}"
 
 	# Returns docker-id
-	did="$( run "docker run --rm -d --name $( get_random_name ) ${args} ${image_name}" "1" )"
-	sleep 10
+	>&2 echo  "------------------------------ [STARTING CONTAINER] ------------------------------"
+	name="$( get_random_name )"
+	run "docker run --rm --platform ${architecture} --name ${name} ${args} ${image_name} &" 1>&2
+	run "sleep 15"
 
-	# If it fails, start again in foreground to fail again, but show errors
-	if ! docker exec $(tty -s && echo "-it" || echo ) ${did} ls >/dev/null 2>&1; then
-		run "docker run --rm --name $( get_random_name ) ${args} ${image_name}" "1"
+	>&2 echo "[CHECK IF RUNNING] docker ps"
+	# Check docker ps if running
+	if ! run "docker ps | grep '${name}'" 1>&2; then
+		docker_stop "${name}"
+		>&2 echo "------------------------------ [STARTING CONTAINER] FAILED ------------------------------"
 		return 1
 	fi
-
-	# Only get 8 digits of docker id
-	echo "${did}" | grep -Eo '^[0-9a-zA-Z]{8}'
+	# Check if we can ls
+	>&2 echo "[CHECK IF RUNNING] docker exec"
+	if ! run "docker exec $(tty -s && echo "-it" || echo ) ${name} id" 1>&2; then
+		docker_stop "${name}"
+		>&2 echo "------------------------------ [STARTING CONTAINER] FAILED ------------------------------"
+		return 1
+	fi
+	>&2 echo "------------------------------ [STARTING CONTAINER] OK ------------------------------"
+	echo "${name}"
 }
 
 
@@ -130,9 +164,9 @@ function docker_run() {
 ### Show Docker logs
 ###
 function docker_logs() {
-	local docker_id="${1}"
+	local name="${1}"
 
-	run "docker logs ${docker_id}"
+	run "docker logs ${name}"
 }
 
 
@@ -140,28 +174,13 @@ function docker_logs() {
 ### Docker exec
 ###
 function docker_exec() {
-	local did="${1}"
+	local name="${1}"
 	local cmd="${2}"
 	shift
 	shift
 	local args="${*}"
 
-	run "docker exec ${args} $(tty -s && echo '-it' || echo) ${did} ${cmd}"
-}
-
-
-###
-### Get docker name
-###
-function docker_name() {
-	local did="${1}"
-	local name=
-	name="$( docker ps | grep "${did}" | awk '{print $(NF)}' )"
-
-	if [ -z "${name}" ]; then
-		return 1
-	fi
-	echo "${name}"
+	run "docker exec ${args} $(tty -s && echo '-it' || echo) ${name} ${cmd}"
 }
 
 
@@ -169,15 +188,59 @@ function docker_name() {
 ### Stop container
 ###
 function docker_stop() {
-	local did="${1}"
-	local name=
-	name="$( docker ps --no-trunc --format='{{.ID}} {{.Names}}' | grep "${did}" | head -1 | awk '{print $2}' )"
+	local name="${1}"
 	# Stop
-	run "docker stop ${did} >/dev/null"
-	if docker ps | grep -q "${did}"; then
-		run "docker kill ${did} >/dev/null" || true
-	fi
-
-	# Remove if still exist
-	run "docker rm ${name} >/dev/null 2>&1 || true"
+	run "docker stop  ${name}" || true
+	run "docker kill  ${name} || true" 2>/dev/null
+	run "docker rm -f ${name} || true" 2>/dev/null
+}
+
+
+###
+### Check if PHP-FPM is up and running
+###
+function check_php_fpm_running() {
+	local name="${1}"
+	local retries="60"
+	local index="0"
+
+	>&2 echo
+
+	# PHP process
+	index=0
+	>&2 echo "Checking if PHP-FPM process is running..."
+	while ! run "docker exec ${name} ps auxwww | grep -E '(php-fpm|php-cgi)'"; do
+		>&2 printf "."
+		index="$(( index + 1 ))"
+		if [ "${index}" = "${retries}" ]; then
+			>&2 echo
+			run "docker exec ${name} ps auxwww"
+			>&2 echo "Failed to find PHP process after ${retries} seconds."
+			return 1
+		fi
+		sleep 1
+	done
+	>&2 echo
+
+	# Docker logs
+	index=0
+	>&2 echo "Checking if PHP-FPM shows success in docker logs..."
+	while ! run "docker logs ${name} 2>&1 | grep -E 'php-fpm entered RUNNING state|ready to handle connections|fpm is running'"; do
+		>&2 printf "."
+		index="$(( index + 1 ))"
+		if [ "${index}" = "${retries}" ]; then
+			>&2 echo
+			>&2 echo "Failed to find PHP success in docker logs after ${retries} seconds."
+			return 1
+		fi
+		sleep 1
+	done
+	>&2 echo
+
+	# Wait some more time for everyting else to settle
+	run "sleep 10"
+
+
+	# Echo newline and return
+	return 0
 }

tests/base/01-test-env-entrypoint.sh

@@ -7,8 +7,10 @@ set -o pipefail
 CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
 
 IMAGE="${1}"
-VERSION="${2}"
-FLAVOUR="${3}"
+ARCH="${2}"
+VERSION="${3}"
+FLAVOUR="${4}"
+TAG="${5}"
 
 # shellcheck disable=SC1090
 . "${CWD}/../.lib.sh"
@@ -22,76 +24,112 @@ FLAVOUR="${3}"
 ###
 ### Debug == 0
 ###
-did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=0" )"
+print_h2 "DEBUG_ENTRYPOINT=0"
+if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=0" )"; then
+	exit 1
+fi
 
-if ! run_fail "docker logs ${did} 2>&1 | grep 'Debug level'"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+# Check if PHP-FPM is running
+print_h2 "Check if PHP-FPM is running"
+if ! check_php_fpm_running "${name}"; then
+	docker_logs "${name}"  || true
+	docker_stop "${name}"  || true
 	echo "Failed"
 	exit 1
 fi
-if ! run_fail "docker logs ${did} 2>&1 | grep '\[INFO\]'"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+
+# Start Tests
+print_h2 "Testing..."
+if ! run_fail "docker logs ${name} 2>&1 | grep '\[INFO\]'"; then
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
 	echo "Failed"
 	exit 1
 fi
-if ! run_fail "docker logs ${did} 2>&1 | grep -E '\[(ERR|\?\?\?)\]'"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+if ! run_fail "docker logs ${name} 2>&1 | grep -E '\[(ERR|\?\?\?)\]'"; then
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
 	echo "Failed"
 	exit 1
 fi
-docker_stop "${did}"
+docker_stop "${name}"
 
 
 ###
 ### Debug == 1
 ###
-did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=1" )"
+print_h2 "DEBUG_ENTRYPOINT=1"
+if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=1" )"; then
+	exit 1
+fi
 
-if ! run "docker logs ${did} 2>&1 | grep 'Debug level: 1'"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+# Check if PHP-FPM is running
+print_h2 "Check if PHP-FPM is running"
+if ! check_php_fpm_running "${name}"; then
+	docker_logs "${name}"  || true
+	docker_stop "${name}"  || true
 	echo "Failed"
 	exit 1
 fi
-if ! run "docker logs ${did} 2>&1 | grep '\[INFO\]'"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+
+# Start Tests
+print_h2 "Testing..."
+if ! run "docker logs ${name} 2>&1 | grep 'Debug level: 1'"; then
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
 	echo "Failed"
 	exit 1
 fi
-if ! run_fail "docker logs ${did} 2>&1 | grep -E '\[(ERR|\?\?\?)\]'"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+if ! run "docker logs ${name} 2>&1 | grep '\[INFO\]'"; then
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
 	echo "Failed"
 	exit 1
 fi
-docker_stop "${did}"
+if ! run_fail "docker logs ${name} 2>&1 | grep -E '\[(ERR|\?\?\?)\]'"; then
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
+	echo "Failed"
+	exit 1
+fi
+docker_stop "${name}"
 
 
 ###
 ### Debug == 2
 ###
-did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2" )"
+print_h2 "DEBUG_ENTRYPOINT=2"
+if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2" )"; then
+	exit 1
+fi
 
-if ! run "docker logs ${did} 2>&1 | grep 'Debug level: 2'"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+# Check if PHP-FPM is running
+print_h2 "Check if PHP-FPM is running"
+if ! check_php_fpm_running "${name}"; then
+	docker_logs "${name}"  || true
+	docker_stop "${name}"  || true
 	echo "Failed"
 	exit 1
 fi
-if ! run "docker logs ${did} 2>&1 | grep '\[INFO\]'"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+
+# Start Tests
+print_h2 "Testing..."
+if ! run "docker logs ${name} 2>&1 | grep 'Debug level: 2'"; then
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
 	echo "Failed"
 	exit 1
 fi
-if ! run_fail "docker logs ${did} 2>&1 | grep -E '\[(ERR|\?\?\?)\]'"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+if ! run "docker logs ${name} 2>&1 | grep '\[INFO\]'"; then
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
 	echo "Failed"
 	exit 1
 fi
-docker_stop "${did}"
+if ! run_fail "docker logs ${name} 2>&1 | grep -E '\[(ERR|\?\?\?)\]'"; then
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
+	echo "Failed"
+	exit 1
+fi
+docker_stop "${name}"

tests/base/02-test-env-uid.sh

@@ -7,8 +7,10 @@ set -o pipefail
 CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
 
 IMAGE="${1}"
-VERSION="${2}"
-FLAVOUR="${3}"
+ARCH="${2}"
+VERSION="${3}"
+FLAVOUR="${4}"
+TAG="${5}"
 
 # shellcheck disable=SC1090
 . "${CWD}/../.lib.sh"
@@ -22,58 +24,100 @@ FLAVOUR="${3}"
 ###
 ### uid: 1005 (new uid)
 ###
-did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=1005" )"
+print_h2 "DEBUG_ENTRYPOINT=2 NEW_UID=1005"
+if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=1005" )"; then
+	exit 1
+fi
 
-if ! run "docker logs ${did} 2>&1 | grep -q '1005'"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+# Check if PHP-FPM is running
+print_h2 "Check if PHP-FPM is running"
+if ! check_php_fpm_running "${name}"; then
+	docker_logs "${name}"  || true
+	docker_stop "${name}"  || true
 	echo "Failed"
 	exit 1
 fi
-if ! docker_exec "${did}" "id | grep 'uid=1005'" "--user=devilbox"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+
+# Start Tests
+print_h2 "Testing..."
+if ! run "docker logs ${name} 2>&1 | grep -q '1005'"; then
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
 	echo "Failed"
 	exit 1
 fi
-docker_stop "${did}"
+if ! docker_exec "${name}" "id | grep 'uid=1005'" "--user=devilbox"; then
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
+	echo "Failed"
+	exit 1
+fi
+docker_stop "${name}"
 
 
 ###
 ### uid: 1000 (same uid)
 ###
-did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=1000" )"
+print_h2 "DEBUG_ENTRYPOINT=2 NEW_UID=1000"
+if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=1000" )"; then
+	exit 1
+fi
 
-if ! run "docker logs ${did} 2>&1 | grep -q '1000'"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+# Check if PHP-FPM is running
+print_h2 "Check if PHP-FPM is running"
+if ! check_php_fpm_running "${name}"; then
+	docker_logs "${name}"  || true
+	docker_stop "${name}"  || true
 	echo "Failed"
 	exit 1
 fi
-if ! docker_exec "${did}" "id | grep 'uid=1000'" "--user=devilbox"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+
+# Start Tests
+print_h2 "Testing..."
+if ! run "docker logs ${name} 2>&1 | grep -q '1000'"; then
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
 	echo "Failed"
 	exit 1
 fi
-docker_stop "${did}"
+if ! docker_exec "${name}" "id | grep 'uid=1000'" "--user=devilbox"; then
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
+	echo "Failed"
+	exit 1
+fi
+docker_stop "${name}"
 
 
 ###
 ### uid: 33 (existing uid)
 ###
-did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=33" )"
+print_h2 "DEBUG_ENTRYPOINT=2 NEW_UID=33"
+if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=33" )"; then
+	exit 1
+fi
 
-if ! run "docker logs ${did} 2>&1 | grep -q '33'"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+# Check if PHP-FPM is running
+print_h2 "Check if PHP-FPM is running"
+if ! check_php_fpm_running "${name}"; then
+	docker_logs "${name}"  || true
+	docker_stop "${name}"  || true
 	echo "Failed"
 	exit 1
 fi
-if ! docker_exec "${did}" "id | grep 'uid=33'" "--user=devilbox"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+
+# Start Tests
+print_h2 "Testing..."
+if ! run "docker logs ${name} 2>&1 | grep -q '33'"; then
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
 	echo "Failed"
 	exit 1
 fi
-docker_stop "${did}"
+if ! docker_exec "${name}" "id | grep 'uid=33'" "--user=devilbox"; then
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
+	echo "Failed"
+	exit 1
+fi
+docker_stop "${name}"

tests/base/03-test-env-gid.sh

@@ -7,8 +7,10 @@ set -o pipefail
 CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
 
 IMAGE="${1}"
-VERSION="${2}"
-FLAVOUR="${3}"
+ARCH="${2}"
+VERSION="${3}"
+FLAVOUR="${4}"
+TAG="${5}"
 
 # shellcheck disable=SC1090
 . "${CWD}/../.lib.sh"
@@ -22,58 +24,100 @@ FLAVOUR="${3}"
 ###
 ### gid: 1005 (new gid)
 ###
-did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_GID=1005" )"
+print_h2 "DEBUG_ENTRYPOINT=2 NEW_GID=1005"
+if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_GID=1005" )"; then
+	exit 1
+fi
 
-if ! run "docker logs ${did} 2>&1 | grep -q '1005'"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+# Check if PHP-FPM is running
+print_h2 "Check if PHP-FPM is running"
+if ! check_php_fpm_running "${name}"; then
+	docker_logs "${name}"  || true
+	docker_stop "${name}"  || true
 	echo "Failed"
 	exit 1
 fi
-if ! docker_exec "${did}" "id | grep 'gid=1005'" "--user=devilbox"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+
+# Start Tests
+print_h2 "Testing..."
+if ! run "docker logs ${name} 2>&1 | grep -q '1005'"; then
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
 	echo "Failed"
 	exit 1
 fi
-docker_stop "${did}"
+if ! docker_exec "${name}" "id | grep 'gid=1005'" "--user=devilbox"; then
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
+	echo "Failed"
+	exit 1
+fi
+docker_stop "${name}"
 
 
 ###
 ### gid: 1000 (same gid)
 ###
-did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_GID=1000" )"
+print_h2 "DEBUG_ENTRYPOINT=2 NEW_GID=1000"
+if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_GID=1000" )"; then
+	exit 1
+fi
 
-if ! run "docker logs ${did} 2>&1 | grep -q '1000'"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+# Check if PHP-FPM is running
+print_h2 "Check if PHP-FPM is running"
+if ! check_php_fpm_running "${name}"; then
+	docker_logs "${name}"  || true
+	docker_stop "${name}"  || true
 	echo "Failed"
 	exit 1
 fi
-if ! docker_exec "${did}" "id | grep 'gid=1000'" "--user=devilbox"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+
+# Start Tests
+print_h2 "Testing..."
+if ! run "docker logs ${name} 2>&1 | grep -q '1000'"; then
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
 	echo "Failed"
 	exit 1
 fi
-docker_stop "${did}"
+if ! docker_exec "${name}" "id | grep 'gid=1000'" "--user=devilbox"; then
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
+	echo "Failed"
+	exit 1
+fi
+docker_stop "${name}"
 
 
 ###
 ### gid: 33 (existing gid)
 ###
-did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_GID=33" )"
+print_h2 "DEBUG_ENTRYPOINT=2 NEW_GID=33"
+if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_GID=33" )"; then
+	exit 1
+fi
 
-if ! run "docker logs ${did} 2>&1 | grep -q '33'"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+# Check if PHP-FPM is running
+print_h2 "Check if PHP-FPM is running"
+if ! check_php_fpm_running "${name}"; then
+	docker_logs "${name}"  || true
+	docker_stop "${name}"  || true
 	echo "Failed"
 	exit 1
 fi
-if ! docker_exec "${did}" "id | grep 'gid=33'" "--user=devilbox"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+
+# Start Tests
+print_h2 "Testing..."
+if ! run "docker logs ${name} 2>&1 | grep -q '33'"; then
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
 	echo "Failed"
 	exit 1
 fi
-docker_stop "${did}"
+if ! docker_exec "${name}" "id | grep 'gid=33'" "--user=devilbox"; then
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
+	echo "Failed"
+	exit 1
+fi
+docker_stop "${name}"

tests/base/04-test-run_nginx.sh

@@ -7,8 +7,10 @@ set -o pipefail
 CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
 
 IMAGE="${1}"
-VERSION="${2}"
-FLAVOUR="${3}"
+ARCH="${2}"
+VERSION="${3}"
+FLAVOUR="${4}"
+TAG="${5}"
 
 # shellcheck disable=SC1090
 . "${CWD}/../.lib.sh"
@@ -37,12 +39,26 @@ chmod 0777 "${CONFIG_HOST}"
 chmod 0777 "${DOC_ROOT_HOST}"
 chmod 0644 "${DOC_ROOT_HOST}/index.php"
 
+
 # Pull Image
-run "until docker pull ${CONTAINER}; do sleep 1; done"
+print_h2 "Pulling Nginx"
+run "until docker pull --platform ${ARCH} ${CONTAINER}; do sleep 1; done"
 
 # Start PHP-FPM
-did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT}" )"
-name="$( docker_name "${did}" )"
+print_h2 "Starting PHP-FPM"
+if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT}" )"; then
+	exit 1
+fi
+
+# Check if PHP-FPM is running
+print_h2 "Check if PHP-FPM is running"
+if ! check_php_fpm_running "${name}"; then
+	docker_logs "${name}"  || true
+	docker_stop "${name}"  || true
+	echo "Failed"
+	exit 1
+fi
+
 
 # Nginx.conf
 {
@@ -62,8 +78,11 @@ name="$( docker_name "${did}" )"
 } > "${CONFIG_HOST}/php.conf"
 
 # Start Nginx
-ndid="$( docker_run "${CONTAINER}" "-v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT} -v ${CONFIG_HOST}:${CONFIG_CONT} -p ${WWW_PORT}:80 --link ${name}" )"
-
+print_h2 "Starting Nginx"
+if ! nginx_name="$( docker_run "${CONTAINER}" "${ARCH}" "-v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT} -v ${CONFIG_HOST}:${CONFIG_CONT} -p ${WWW_PORT}:80 --link ${name}" )"; then
+	docker_stop "${name}"  || true
+	exit 1
+fi
 # Wait for both containers to be up and running
 run "sleep 10"
 
@@ -71,18 +90,18 @@ run "sleep 10"
 ###
 ### Check correct PHP-FPM user
 ###
-
+print_h2 "Check PHP-FPM user"
 # On pm = ondemand, there will be no child process, so we need to create some traffic
 # in order to have child proccesses spawn
 for i in $(seq 1 10); do
-	curl http://127.0.0.1:${WWW_PORT}/index.php?${i} >/dev/null 2>&1 &
+	curl "http://127.0.0.1:${WWW_PORT}/index.php?${i}" >/dev/null 2>&1 &
 done
-if ! docker_exec "${did}" "ps auxw | grep -E '(php-fpm: pool|php-cgi)' | grep -v grep | awk '{ print \$1 }' | tail -1 | grep devilbox"; then
-	docker_exec "${did}" "ps auxw"
+if ! docker_exec "${name}" "ps auxw | grep -E '(php-fpm|php-cgi)' | grep -v grep | awk '{ print \$1 }' | tail -1 | grep devilbox"; then
+	docker_exec "${name}" "ps auxw"
 
 	# Shutdown
-	docker_stop "${ndid}" || true
-	docker_stop "${did}"  || true
+	docker_stop "${nginx_name}" || true
+	docker_stop "${name}"       || true
 	rm -rf "${DOC_ROOT_HOST}"
 	rm -rf "${CONFIG_HOST}"
 	echo "Failed"
@@ -94,6 +113,7 @@ fi
 ###
 ### Test Nginx with PHP-FPM
 ###
+print_h2 "Test Nginx with PHP-FPM"
 if ! run "curl -q -4 http://127.0.0.1:${WWW_PORT}/index.php 2>&1 | grep '${FINDME}'"; then
 
 	# Info
@@ -101,25 +121,25 @@ if ! run "curl -q -4 http://127.0.0.1:${WWW_PORT}/index.php 2>&1 | grep '${FINDM
 	run "curl -4 http://127.0.0.1:${WWW_PORT}/index.php" || true
 	run "curl -6 http://127.0.0.1:${WWW_PORT}/index.php" || true
 	run "docker ps --no-trunc"
-	docker_exec "${ndid}" "nginx -t"
+	docker_exec "${nginx_name}" "nginx -t"
 
 	# Show logs
-	docker_logs "${ndid}" || true
-	docker_logs "${did}"  || true
+	docker_logs "${nginx_name}" || true
+	docker_logs "${name}"       || true
 
 	# Ensure file is available
-	docker_exec "${ndid}" "ls -la ${DOC_ROOT_CONT}/"
-	docker_exec "${did}"  "ls -la ${DOC_ROOT_CONT}/"
+	docker_exec "${nginx_name}" "ls -la ${DOC_ROOT_CONT}/"
+	docker_exec "${name}"       "ls -la ${DOC_ROOT_CONT}/"
 
-	docker_exec "${ndid}" "cat ${DOC_ROOT_CONT}/index.php"
-	docker_exec "${did}"  "cat ${DOC_ROOT_CONT}/index.php"
+	docker_exec "${nginx_name}" "cat ${DOC_ROOT_CONT}/index.php"
+	docker_exec "${name}"       "cat ${DOC_ROOT_CONT}/index.php"
 
 	# Nginx configuration
-	docker_exec "${ndid}" "cat ${CONFIG_CONT}/php.conf"
+	docker_exec "${nginx_name}" "cat ${CONFIG_CONT}/php.conf"
 
 	# Shutdown
-	docker_stop "${ndid}" || true
-	docker_stop "${did}"  || true
+	docker_stop "${nginx_name}" || true
+	docker_stop "${name}"       || true
 	rm -rf "${DOC_ROOT_HOST}"
 	rm -rf "${CONFIG_HOST}"
 	echo "Failed"
@@ -130,7 +150,8 @@ fi
 ###
 ### Clean-up
 ###
-docker_stop "${did}"
-docker_stop "${ndid}"
+print_h2 "Cleanup"
+docker_stop "${nginx_name}"
+docker_stop "${name}"
 rm -rf "${DOC_ROOT_HOST}"
 rm -rf "${CONFIG_HOST}"

tests/base/06-test-apt-repositories.sh

@@ -7,8 +7,10 @@ set -o pipefail
 CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
 
 IMAGE="${1}"
-VERSION="${2}"
-FLAVOUR="${3}"
+ARCH="${2}"
+VERSION="${3}"
+FLAVOUR="${4}"
+TAG="${5}"
 
 # shellcheck disable=SC1090
 . "${CWD}/../.lib.sh"
@@ -22,12 +24,26 @@ FLAVOUR="${3}"
 ###
 ### Ensuring 'apt update' works without any issues
 ###
-did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2" )"
+print_h2 "Ensure 'apt update' works"
+if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2" )"; then
+	exit 1
+fi
 
-if ! docker_exec "${did}" "apt update"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+# Check if PHP-FPM is running
+print_h2 "Check if PHP-FPM is running"
+if ! check_php_fpm_running "${name}"; then
+	docker_logs "${name}"  || true
+	docker_stop "${name}"  || true
 	echo "Failed"
 	exit 1
 fi
-docker_stop "${did}"
+
+# Start Tests
+print_h2 "Testing..."
+if ! docker_exec "${name}" "apt update"; then
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
+	echo "Failed"
+	exit 1
+fi
+docker_stop "${name}"

tests/mods/01-test-modules.sh

@@ -7,8 +7,10 @@ set -o pipefail
 CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
 
 IMAGE="${1}"
-VERSION="${2}"
-FLAVOUR="${3}"
+ARCH="${2}"
+VERSION="${3}"
+FLAVOUR="${4}"
+TAG="${5}"
 
 
 # shellcheck disable=SC1090
@@ -21,7 +23,7 @@ FLAVOUR="${3}"
 
 ERROR=0
 for dir in $( ls -1 "${CWD}/modules/" ); do
-	if ! "${CWD}/modules.sh" "${IMAGE}" "${VERSION}" "${FLAVOUR}" "${dir}"; then
+	if ! "${CWD}/modules.sh" "${IMAGE}" "${ARCH}" "${VERSION}" "${FLAVOUR}" "${TAG}" "${dir}"; then
 		ERROR="$(( ERROR + 1 ))"
 	fi
 done

tests/mods/modules.sh

@@ -6,15 +6,17 @@ set -o pipefail
 
 CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
 
-if [ "${#}" != "4" ]; then
-	>&2 echo "Error, requires 4 arguments: <IMAGE> <VERSION> <FLAVOUR> <MODULE>"
+if [ "${#}" != "6" ]; then
+	>&2 echo "Error, requires 6 arguments: <IMAGE> <ARCH> <VERSION> <FLAVOUR> <TAG> <MODULE>"
 	exit 1
 fi
 
 IMAGE="${1}"
-VERSION="${2}"
-FLAVOUR="${3}"
-MODULE="${4}"
+ARCH="${2}"
+VERSION="${3}"
+FLAVOUR="${4}"
+TAG="${5}"
+MODULE="${6}"
 
 # shellcheck disable=SC1090
 . "${CWD}/../.lib.sh"
@@ -47,13 +49,14 @@ fi
 WORKDIR="/tmp/${MODULE}"
 docker run \
 	--rm \
+	--platform "${ARCH}" \
 	-e DEBUG_ENTRYPOINT=0 \
 	-e NEW_UID="$(id -u)" \
 	-e NEW_GID="$(id -g)" \
 	-v "${CWD}/modules/${MODULE}:${WORKDIR}" \
 	--entrypoint=sh \
 	--workdir="${WORKDIR}" \
-	"${IMAGE}:${VERSION}-${FLAVOUR}" \
+	"${IMAGE}:${TAG}" \
 	-c 'find . -name "*.php" -type f -print0 | xargs -0 -n1 sh -c "
 		set -e
 		set -u

tests/prod/01-test-env-timezone.sh

@@ -7,8 +7,10 @@ set -o pipefail
 CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
 
 IMAGE="${1}"
-VERSION="${2}"
-FLAVOUR="${3}"
+ARCH="${2}"
+VERSION="${3}"
+FLAVOUR="${4}"
+TAG="${5}"
 
 # shellcheck disable=SC1090
 . "${CWD}/../.lib.sh"
@@ -22,25 +24,39 @@ FLAVOUR="${3}"
 ###
 ### Europe/Berlin
 ###
-did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e TIMEZONE=Europe/Berlin" )"
+print_h2 "-e DEBUG_ENTRYPOINT=2 -e TIMEZONE=Europe/Berlin"
+if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e TIMEZONE=Europe/Berlin" )"; then
+	exit 1
+fi
 
-if ! run "docker logs ${did} 2>&1 | grep -q 'Europe/Berlin'"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+# Check if PHP-FPM is running
+print_h2 "Check if PHP-FPM is running"
+if ! check_php_fpm_running "${name}"; then
+	docker_logs "${name}"  || true
+	docker_stop "${name}"  || true
 	echo "Failed"
 	exit 1
 fi
-if ! docker_exec "${did}" "date | grep -E 'CE(S)*T'"; then
-	docker_exec "${did}" "date"
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+
+# Start Tests
+print_h2 "Testing..."
+if ! run "docker logs ${name} 2>&1 | grep -q 'Europe/Berlin'"; then
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
 	echo "Failed"
 	exit 1
 fi
-if ! docker_exec "${did}" "php -i | grep -E 'date\.timezone' | grep 'Europe/Berlin'"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+if ! docker_exec "${name}" "date | grep -E 'CE(S)*T'"; then
+	docker_exec "${name}" "date"
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
 	echo "Failed"
 	exit 1
 fi
-docker_stop "${did}"
+if ! docker_exec "${name}" "php -i | grep -E 'date\.timezone' | grep 'Europe/Berlin'"; then
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
+	echo "Failed"
+	exit 1
+fi
+docker_stop "${name}"

tests/prod/02-test-env-docker_logs-stdout.sh

@@ -7,8 +7,10 @@ set -o pipefail
 CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
 
 IMAGE="${1}"
-VERSION="${2}"
-FLAVOUR="${3}"
+ARCH="${2}"
+VERSION="${3}"
+FLAVOUR="${4}"
+TAG="${5}"
 
 # shellcheck disable=SC1090
 . "${CWD}/../.lib.sh"
@@ -40,13 +42,28 @@ chmod 0777 -R "${CFG_DIR_HOST}"
 chmod 0777 -R "${WWW_DIR_HOST}"
 
 
+# Pull Image
+print_h2 "Pulling Nginx"
+run "until docker pull --platform ${ARCH} ${CONTAINER}; do sleep 1; done"
+
 ###
 ### Start container
 ###
 
 # Start PHP-FPM
-did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -e DOCKER_LOGS=1 -v ${WWW_DIR_HOST}:${WWW_DIR_CONT} -v ${LOG_DIR_HOST}:/var/log/php" )"
-name="$( docker_name "${did}" )"
+print_h2 "Starting PHP-FPM"
+if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -e DOCKER_LOGS=1 -v ${WWW_DIR_HOST}:${WWW_DIR_CONT} -v ${LOG_DIR_HOST}:/var/log/php" )"; then
+	exit 1
+fi
+
+# Check if PHP-FPM is running
+print_h2 "Check if PHP-FPM is running"
+if ! check_php_fpm_running "${name}"; then
+	docker_logs "${name}"  || true
+	docker_stop "${name}"  || true
+	echo "Failed"
+	exit 1
+fi
 
 # Nginx.conf
 {
@@ -67,8 +84,11 @@ name="$( docker_name "${did}" )"
 
 
 # Start Nginx
-ndid="$( docker_run "${CONTAINER}" "-v ${WWW_DIR_HOST}:${WWW_DIR_CONT} -v ${CFG_DIR_HOST}:${CFG_DIR_CONT} -p ${WWW_PORT}:80 --link ${name}" )"
-
+print_h2 "Starting Nginx"
+if ! nginx_name="$( docker_run "${CONTAINER}" "${ARCH}" "-v ${WWW_DIR_HOST}:${WWW_DIR_CONT} -v ${CFG_DIR_HOST}:${CFG_DIR_CONT} -p ${WWW_PORT}:80 --link ${name}" )"; then
+	docker_stop "${name}"  || true
+	exit 1
+fi
 # Wait for both containers to be up and running
 run "sleep 10"
 
@@ -76,6 +96,7 @@ run "sleep 10"
 ###
 ### Fire positive and error generating request
 ###
+print_h2 "Fire curl requests"
 run "curl http://localhost:${WWW_PORT}/ok.php"
 run "curl http://localhost:${WWW_PORT}/fail.php"
 
@@ -83,10 +104,12 @@ run "curl http://localhost:${WWW_PORT}/fail.php"
 ###
 ### Run tests
 ###
-if ! run "docker logs ${did} 2>&1 | grep -q 'DOCKER_LOGS'"; then
-	docker_logs "${did}" || true
-	docker_stop "${ndid}" || true
-	docker_stop "${did}" || true
+print_h2 "Checking DOCKER_LOGS"
+if ! run "docker logs ${name} 2>&1 | grep 'DOCKER_LOGS'"; then
+	docker_logs "${nginx_name}" || true
+	docker_logs "${name}"       || true
+	docker_stop "${nginx_name}" || true
+	docker_stop "${name}"       || true
 	rm -rf "${LOG_DIR_HOST}"
 	rm -rf "${CFG_DIR_HOST}"
 	rm -rf "${WWW_DIR_HOST}"
@@ -94,13 +117,15 @@ if ! run "docker logs ${did} 2>&1 | grep -q 'DOCKER_LOGS'"; then
 	exit 1
 fi
 
-if [ -f "${LOG_DIR_HOST}/php-fpm.access" ]; then
+print_h2 "Ensure php-fpm.access does not exist"
+if ! run_fail "test -f ${LOG_DIR_HOST}/php-fpm.access"; then
 	echo "Access log should not exist: ${LOG_DIR_HOST}/php-fpm.access"
-	ls -lap ${LOG_DIR_HOST}/
+	ls -lap "${LOG_DIR_HOST}/"
 	cat "${LOG_DIR_HOST}/php-fpm.access"
-	docker_logs "${did}" || true
-	docker_stop "${ndid}" || true
-	docker_stop "${did}" || true
+	docker_logs "${nginx_name}" || true
+	docker_logs "${name}"       || true
+	docker_stop "${nginx_name}" || true
+	docker_stop "${name}"       || true
 	rm -rf "${LOG_DIR_HOST}"
 	rm -rf "${CFG_DIR_HOST}"
 	rm -rf "${WWW_DIR_HOST}"
@@ -108,13 +133,15 @@ if [ -f "${LOG_DIR_HOST}/php-fpm.access" ]; then
 	exit 1
 fi
 
-if [ -f "${LOG_DIR_HOST}/php-fpm.error" ]; then
+print_h2 "Ensure php-fpm.error does not exist"
+if ! run_fail "test -f ${LOG_DIR_HOST}/php-fpm.error"; then
 	echo "Error log should not exist: ${LOG_DIR_HOST}/php-fpm.error"
-	ls -lap ${LOG_DIR_HOST}/
+	ls -lap "${LOG_DIR_HOST}/"
 	cat "${LOG_DIR_HOST}/php-fpm.error"
-	docker_logs "${did}" || true
-	docker_stop "${ndid}" || true
-	docker_stop "${did}" || true
+	docker_logs "${nginx_name}" || true
+	docker_logs "${name}"       || true
+	docker_stop "${nginx_name}" || true
+	docker_stop "${name}"       || true
 	rm -rf "${LOG_DIR_HOST}"
 	rm -rf "${CFG_DIR_HOST}"
 	rm -rf "${WWW_DIR_HOST}"
@@ -126,33 +153,39 @@ fi
 ### PHP 5.2 still does not show any errors
 ###
 if [ "${VERSION}" != "5.2" ]; then
-	if ! run "docker logs ${did} 2>&1 | grep -q 'GET /ok.php'"; then
+	print_h2 "Ensure stderr access logging is enabled"
+	if ! run "docker logs ${name} 2>&1 | grep 'GET /ok.php'"; then
 		echo "Error no access log string for 'GET /ok.php' found in stderr"
-		docker_logs "${did}" || true
-		docker_stop "${ndid}" || true
-		docker_stop "${did}" || true
+		docker_logs "${nginx_name}" || true
+		docker_logs "${name}"       || true
+		docker_stop "${nginx_name}" || true
+		docker_stop "${name}"       || true
 		rm -rf "${LOG_DIR_HOST}"
 		rm -rf "${CFG_DIR_HOST}"
 		rm -rf "${WWW_DIR_HOST}"
 		echo "Failed"
 		exit 1
 	fi
-	if ! run "docker logs ${did} 2>&1 | grep -q 'GET /fail.php'"; then
+	print_h2 "Ensure stderr access logging is enabled"
+	if ! run "docker logs ${name} 2>&1 | grep 'GET /fail.php'"; then
 		echo "Error no access log string for 'GET /fail.php' found in stderr"
-		docker_logs "${did}" || true
-		docker_stop "${ndid}" || true
-		docker_stop "${did}" || true
+		docker_logs "${nginx_name}" || true
+		docker_logs "${name}"       || true
+		docker_stop "${nginx_name}" || true
+		docker_stop "${name}"       || true
 		rm -rf "${LOG_DIR_HOST}"
 		rm -rf "${CFG_DIR_HOST}"
 		rm -rf "${WWW_DIR_HOST}"
 		echo "Failed"
 		exit 1
 	fi
-	if ! run "docker logs ${did} 2>&1 | grep -q '/var/www/default/fail.php'"; then
+	print_h2 "Ensure errors are logged to stderr"
+	if ! run "docker logs ${name} 2>&1 | grep '/var/www/default/fail.php'"; then
 		echo "Error no error message found in stderr"
-		docker_logs "${did}" || true
-		docker_stop "${ndid}" || true
-		docker_stop "${did}" || true
+		docker_logs "${nginx_name}" || true
+		docker_logs "${name}"       || true
+		docker_stop "${nginx_name}" || true
+		docker_stop "${name}"       || true
 		rm -rf "${LOG_DIR_HOST}"
 		rm -rf "${CFG_DIR_HOST}"
 		rm -rf "${WWW_DIR_HOST}"
@@ -165,8 +198,9 @@ fi
 ###
 ### Shutdown
 ###
-docker_stop "${ndid}" || true
-docker_stop "${did}"
+print_h2 "Cleanup"
+docker_stop "${nginx_name}" || true
+docker_stop "${name}"       || true
 rm -rf "${LOG_DIR_HOST}"
 rm -rf "${CFG_DIR_HOST}"
 rm -rf "${WWW_DIR_HOST}"

tests/prod/03-test-env-docker_logs-file.sh

@@ -7,8 +7,10 @@ set -o pipefail
 CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
 
 IMAGE="${1}"
-VERSION="${2}"
-FLAVOUR="${3}"
+ARCH="${2}"
+VERSION="${3}"
+FLAVOUR="${4}"
+TAG="${5}"
 
 # shellcheck disable=SC1090
 . "${CWD}/../.lib.sh"
@@ -40,13 +42,28 @@ chmod 0777 -R "${CFG_DIR_HOST}"
 chmod 0777 -R "${WWW_DIR_HOST}"
 
 
+# Pull Image
+print_h2 "Pulling Nginx"
+run "until docker pull --platform ${ARCH} ${CONTAINER}; do sleep 1; done"
+
 ###
 ### Start container
 ###
 
 # Start PHP-FPM
-did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -e DOCKER_LOGS=0 -v ${WWW_DIR_HOST}:${WWW_DIR_CONT} -v ${LOG_DIR_HOST}:/var/log/php" )"
-name="$( docker_name "${did}" )"
+print_h2 "Starting PHP-FPM"
+if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -e DOCKER_LOGS=0 -v ${WWW_DIR_HOST}:${WWW_DIR_CONT} -v ${LOG_DIR_HOST}:/var/log/php" )"; then
+	exit 1
+fi
+
+# Check if PHP-FPM is running
+print_h2 "Check if PHP-FPM is running"
+if ! check_php_fpm_running "${name}"; then
+	docker_logs "${name}"  || true
+	docker_stop "${name}"  || true
+	echo "Failed"
+	exit 1
+fi
 
 # Nginx.conf
 {
@@ -67,7 +84,11 @@ name="$( docker_name "${did}" )"
 
 
 # Start Nginx
-ndid="$( docker_run "${CONTAINER}" "-v ${WWW_DIR_HOST}:${WWW_DIR_CONT} -v ${CFG_DIR_HOST}:${CFG_DIR_CONT} -p ${WWW_PORT}:80 --link ${name}" )"
+print_h2 "Starting Nginx"
+if ! nginx_name="$( docker_run "${CONTAINER}" "${ARCH}" "-v ${WWW_DIR_HOST}:${WWW_DIR_CONT} -v ${CFG_DIR_HOST}:${CFG_DIR_CONT} -p ${WWW_PORT}:80 --link ${name}" )"; then
+	docker_stop "${name}"  || true
+	exit 1
+fi
 
 # Wait for both containers to be up and running
 run "sleep 10"
@@ -76,6 +97,7 @@ run "sleep 10"
 ###
 ### Fire positive and error generating request
 ###
+print_h2 "Fire curl requests"
 run "curl http://localhost:${WWW_PORT}/ok.php"
 run "curl http://localhost:${WWW_PORT}/fail.php"
 
@@ -83,10 +105,11 @@ run "curl http://localhost:${WWW_PORT}/fail.php"
 ###
 ### Run tests
 ###
-if ! run "docker logs ${did} 2>&1 | grep -q 'DOCKER_LOGS'"; then
-	docker_logs "${did}" || true
-	docker_stop "${ndid}" || true
-	docker_stop "${did}" || true
+print_h2 "Checking DOCKER_LOGS"
+if ! run "docker logs ${name} 2>&1 | grep 'DOCKER_LOGS'"; then
+	docker_logs "${name}" || true
+	docker_stop "${nginx_name}" || true
+	docker_stop "${name}" || true
 	rm -rf "${LOG_DIR_HOST}"
 	rm -rf "${CFG_DIR_HOST}"
 	rm -rf "${WWW_DIR_HOST}"
@@ -94,24 +117,29 @@ if ! run "docker logs ${did} 2>&1 | grep -q 'DOCKER_LOGS'"; then
 	exit 1
 fi
 
-if [ ! -f "${LOG_DIR_HOST}/php-fpm.access" ]; then
+print_h2 "Ensure php-fpm.access exists"
+if ! run "test -f ${LOG_DIR_HOST}/php-fpm.access"; then
 	echo "Access log does not exist: ${LOG_DIR_HOST}/php-fpm.access"
-	ls -lap ${LOG_DIR_HOST}/
-	docker_logs "${did}" || true
-	docker_stop "${ndid}" || true
-	docker_stop "${did}" || true
+	ls -lap "${LOG_DIR_HOST}/"
+	docker_logs "${nginx_name}" || true
+	docker_logs "${name}"       || true
+	docker_stop "${nginx_name}" || true
+	docker_stop "${name}"       || true
 	rm -rf "${LOG_DIR_HOST}"
 	rm -rf "${CFG_DIR_HOST}"
 	rm -rf "${WWW_DIR_HOST}"
 	echo "Failed"
 	exit 1
 fi
-if [ ! -r "${LOG_DIR_HOST}/php-fpm.access" ]; then
+
+print_h2 "Ensure php-fpm.access is readable"
+if ! run "test -r ${LOG_DIR_HOST}/php-fpm.access"; then
 	echo "Access log is not readable"
-	ls -lap ${LOG_DIR_HOST}/
-	docker_logs "${did}" || true
-	docker_stop "${ndid}" || true
-	docker_stop "${did}" || true
+	ls -lap "${LOG_DIR_HOST}/"
+	docker_logs "${nginx_name}" || true
+	docker_logs "${name}"       || true
+	docker_stop "${nginx_name}" || true
+	docker_stop "${name}"       || true
 	rm -rf "${LOG_DIR_HOST}"
 	rm -rf "${CFG_DIR_HOST}"
 	rm -rf "${WWW_DIR_HOST}"
@@ -119,24 +147,14 @@ if [ ! -r "${LOG_DIR_HOST}/php-fpm.access" ]; then
 	exit 1
 fi
 
-if [ ! -f "${LOG_DIR_HOST}/php-fpm.error" ]; then
+print_h2 "Ensure php-fpm.error exists"
+if ! run "test -f ${LOG_DIR_HOST}/php-fpm.error"; then
 	echo "Error log does not exist: ${LOG_DIR_HOST}/php-fpm.error"
-	ls -lap ${LOG_DIR_HOST}/
-	docker_logs "${did}" || true
-	docker_stop "${ndid}" || true
-	docker_stop "${did}" || true
-	rm -rf "${LOG_DIR_HOST}"
-	rm -rf "${CFG_DIR_HOST}"
-	rm -rf "${WWW_DIR_HOST}"
-	echo "Failed"
-	exit 1
-fi
-if [ ! -r "${LOG_DIR_HOST}/php-fpm.error" ]; then
-	echo "Error log is not readable"
-	ls -lap ${LOG_DIR_HOST}/
-	docker_logs "${did}" || true
-	docker_stop "${ndid}" || true
-	docker_stop "${did}" || true
+	ls -lap "${LOG_DIR_HOST}/"
+	docker_logs "${nginx_name}" || true
+	docker_logs "${name}"       || true
+	docker_stop "${nginx_name}" || true
+	docker_stop "${name}"       || true
 	rm -rf "${LOG_DIR_HOST}"
 	rm -rf "${CFG_DIR_HOST}"
 	rm -rf "${WWW_DIR_HOST}"
@@ -144,40 +162,62 @@ if [ ! -r "${LOG_DIR_HOST}/php-fpm.error" ]; then
 	exit 1
 fi
 
-# Ensure no access/error goes to stderr
-if run "docker logs ${did} 2>&1 | grep -q 'GET /ok.php'"; then
+print_h2 "Ensure php-fpm.error is readable"
+if ! run "test -r ${LOG_DIR_HOST}/php-fpm.error"; then
+	echo "Error log is not readable"
+	ls -lap "${LOG_DIR_HOST}/"
+	docker_logs "${nginx_name}" || true
+	docker_logs "${name}"       || true
+	docker_stop "${nginx_name}" || true
+	docker_stop "${name}"       || true
+	rm -rf "${LOG_DIR_HOST}"
+	rm -rf "${CFG_DIR_HOST}"
+	rm -rf "${WWW_DIR_HOST}"
+	echo "Failed"
+	exit 1
+fi
+
+print_h2 "Ensure no access/error logging exists in stderr (ok.php)"
+if run "docker logs ${name} 2>&1 | grep 'GET /ok.php'"; then
 	echo "Error access log string for 'GET /ok.php' found in stderr, but shold go to file"
 	run "cat ${LOG_DIR_HOST}/php-fpm.access"
 	run "cat ${LOG_DIR_HOST}/php-fpm.error"
-	docker_logs "${did}" || true
-	docker_stop "${ndid}" || true
-	docker_stop "${did}" || true
+	docker_logs "${nginx_name}" || true
+	docker_logs "${name}"       || true
+	docker_stop "${nginx_name}" || true
+	docker_stop "${name}"       || true
 	rm -rf "${LOG_DIR_HOST}"
 	rm -rf "${CFG_DIR_HOST}"
 	rm -rf "${WWW_DIR_HOST}"
 	echo "Failed"
 	exit 1
 fi
-if run "docker logs ${did} 2>&1 | grep -q 'GET /fail.php'"; then
+
+print_h2 "Ensure no access/error logging exists in stderr (fail.php)"
+if run "docker logs ${name} 2>&1 | grep 'GET /fail.php'"; then
 	echo "Error access log string for 'GET /fail.php' found in stderr, but should go to file"
 	run "cat ${LOG_DIR_HOST}/php-fpm.access"
 	run "cat ${LOG_DIR_HOST}/php-fpm.error"
-	docker_logs "${did}" || true
-	docker_stop "${ndid}" || true
-	docker_stop "${did}" || true
+	docker_logs "${nginx_name}" || true
+	docker_logs "${name}"       || true
+	docker_stop "${nginx_name}" || true
+	docker_stop "${name}"       || true
 	rm -rf "${LOG_DIR_HOST}"
 	rm -rf "${CFG_DIR_HOST}"
 	rm -rf "${WWW_DIR_HOST}"
 	echo "Failed"
 	exit 1
 fi
-if run "docker logs ${did} 2>&1 | grep -q '/var/www/default/fail.php'"; then
+
+print_h2 "Ensure no error message is present in stderr"
+if run "docker logs ${name} 2>&1 | grep '/var/www/default/fail.php'"; then
 	echo "Error error message found in stderr, but should go to file"
 	run "cat ${LOG_DIR_HOST}/php-fpm.access"
 	run "cat ${LOG_DIR_HOST}/php-fpm.error"
-	docker_logs "${did}" || true
-	docker_stop "${ndid}" || true
-	docker_stop "${did}" || true
+	docker_logs "${nginx_name}" || true
+	docker_logs "${name}"       || true
+	docker_stop "${nginx_name}" || true
+	docker_stop "${name}"       || true
 	rm -rf "${LOG_DIR_HOST}"
 	rm -rf "${CFG_DIR_HOST}"
 	rm -rf "${WWW_DIR_HOST}"
@@ -188,26 +228,31 @@ fi
 # PHP-FPM 5.2 does not show access logs
 if [ "${VERSION}" != "5.2" ]; then
 	# Test access and error file for correct content
-	if ! run "grep -q 'GET /ok.php' ${LOG_DIR_HOST}/php-fpm.access"; then
+	print_h2 "Test access logs in php-fpm.access (ok.php)"
+	if ! run "grep 'GET /ok.php' ${LOG_DIR_HOST}/php-fpm.access"; then
 		echo "Error no access log string for 'GET /ok.php' found in: ${LOG_DIR_HOST}/php-fpm.access"
 		run "cat ${LOG_DIR_HOST}/php-fpm.access"
 		run "cat ${LOG_DIR_HOST}/php-fpm.error"
-		docker_logs "${did}" || true
-		docker_stop "${ndid}" || true
-		docker_stop "${did}" || true
+		docker_logs "${nginx_name}" || true
+		docker_logs "${name}"       || true
+		docker_stop "${nginx_name}" || true
+		docker_stop "${name}"       || true
 		rm -rf "${LOG_DIR_HOST}"
 		rm -rf "${CFG_DIR_HOST}"
 		rm -rf "${WWW_DIR_HOST}"
 		echo "Failed"
 		exit 1
 	fi
-	if ! run "grep -q 'GET /fail.php' ${LOG_DIR_HOST}/php-fpm.access"; then
+
+	print_h2 "Test access logs in php-fpm.access (fail.php)"
+	if ! run "grep 'GET /fail.php' ${LOG_DIR_HOST}/php-fpm.access"; then
 		echo "Error no access log string for 'GET /fail.php' found in: ${LOG_DIR_HOST}/php-fpm.access"
 		run "cat ${LOG_DIR_HOST}/php-fpm.access"
 		run "cat ${LOG_DIR_HOST}/php-fpm.error"
-		docker_logs "${did}" || true
-		docker_stop "${ndid}" || true
-		docker_stop "${did}" || true
+		docker_logs "${nginx_name}" || true
+		docker_logs "${name}"       || true
+		docker_stop "${nginx_name}" || true
+		docker_stop "${name}"       || true
 		rm -rf "${LOG_DIR_HOST}"
 		rm -rf "${CFG_DIR_HOST}"
 		rm -rf "${WWW_DIR_HOST}"
@@ -215,13 +260,16 @@ if [ "${VERSION}" != "5.2" ]; then
 		exit 1
 	fi
 fi
-if ! run "grep -q '/var/www/default/fail.php' ${LOG_DIR_HOST}/php-fpm.error"; then
+
+print_h2 "Ensiure error message is present in php-fpm.error"
+if ! run "grep '/var/www/default/fail.php' ${LOG_DIR_HOST}/php-fpm.error"; then
 	echo "Error no error message found in:  ${LOG_DIR_HOST}/php-fpm.error"
 	run "cat ${LOG_DIR_HOST}/php-fpm.access"
 	run "cat ${LOG_DIR_HOST}/php-fpm.error"
-	docker_logs "${did}" || true
-	docker_stop "${ndid}" || true
-	docker_stop "${did}" || true
+	docker_logs "${nginx_name}" || true
+	docker_logs "${name}"       || true
+	docker_stop "${nginx_name}" || true
+	docker_stop "${name}"       || true
 	rm -rf "${LOG_DIR_HOST}"
 	rm -rf "${CFG_DIR_HOST}"
 	rm -rf "${WWW_DIR_HOST}"
@@ -233,12 +281,13 @@ fi
 ###
 ### Shutdown
 ###
-docker_logs "${did}" || true
+print_h2 "Cleanup"
+docker_logs "${name}" || true
 run "ls -lap ${LOG_DIR_HOST}/"
 run "cat ${LOG_DIR_HOST}/php-fpm.access"
 run "cat ${LOG_DIR_HOST}/php-fpm.error"
-docker_stop "${ndid}" || true
-docker_stop "${did}"
+docker_stop "${nginx_name}" || true
+docker_stop "${name}"
 rm -rf "${LOG_DIR_HOST}"
 rm -rf "${CFG_DIR_HOST}"
 rm -rf "${WWW_DIR_HOST}"

tests/prod/04-test-env-enable_mail.sh

@@ -7,8 +7,10 @@ set -o pipefail
 CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
 
 IMAGE="${1}"
-VERSION="${2}"
-FLAVOUR="${3}"
+ARCH="${2}"
+VERSION="${3}"
+FLAVOUR="${4}"
+TAG="${5}"
 
 # shellcheck disable=SC1090
 . "${CWD}/../.lib.sh"
@@ -23,12 +25,26 @@ FLAVOUR="${3}"
 ### Postfix
 ###
 MOUNTPOINT="$( mktemp --directory )"
-did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -e ENABLE_MAIL=2 -v ${MOUNTPOINT}:/var/mail" )"
-run "sleep 10"
 
-if ! run "docker logs ${did} 2>&1 | grep -q 'ENABLE_MAIL'"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+print_h2 "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -e ENABLE_MAIL=2 -v ${MOUNTPOINT}:/var/mail"
+if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -e ENABLE_MAIL=2 -v ${MOUNTPOINT}:/var/mail" )"; then
+	exit 1
+fi
+
+# Check if PHP-FPM is running
+print_h2 "Check if PHP-FPM is running"
+if ! check_php_fpm_running "${name}"; then
+	docker_logs "${name}"  || true
+	docker_stop "${name}"  || true
+	echo "Failed"
+	exit 1
+fi
+
+# Start Tests
+print_h2 "Testing..."
+if ! run "docker logs ${name} 2>&1 | grep -q 'ENABLE_MAIL'"; then
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
 	rm -rf "${MOUNTPOINT}"
 	echo "Failed"
 	exit 1
@@ -37,8 +53,8 @@ fi
 if [ ! -f "${MOUNTPOINT}/devilbox" ]; then
 	echo "Mail file does not exist: ${MOUNTPOINT}/devilbox"
 	ls -lap "${MOUNTPOINT}/"
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
 	rm -rf "${MOUNTPOINT}"
 	echo "Failed"
 	exit 1
@@ -46,25 +62,37 @@ fi
 if [ ! -r "${MOUNTPOINT}/devilbox" ]; then
 	echo "Mail file is not readable"
 	ls -lap "${MOUNTPOINT}/"
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
+	docker_logs "${name}" || true
+	docker_stop "${name}" || true
 	rm -rf "${MOUNTPOINT}"
 	echo "Failed"
 	exit 1
 fi
 
 # Send test email
-docker_exec "${did}" "php -r \"mail('mailtest@devilbox.org', 'the subject', 'the message');\""
-run "sleep 5"
+print_h2 "Send test email"
+docker_exec "${name}" "php -r \"mail('mailtest@devilbox.org', 'the subject', 'the message');\""
 
-if ! run "grep 'the subject' ${MOUNTPOINT}/devilbox"; then
-	docker_logs "${did}" || true
-	docker_stop "${did}" || true
-	run "cat ${MOUNTPOINT}/devilbox"
-	rm -rf "${MOUNTPOINT}"
-	echo "Failed"
-	exit 1
-fi
 
-docker_stop "${did}"
+# Probe if email has been received
+print_h2 "Probe for sent email"
+RETRIES=60
+INDEX=0
+while ! run "grep 'the subject' ${MOUNTPOINT}/devilbox"; do
+	if [ "${RETRIES}" = "${INDEX}" ]; then
+		docker_logs "${name}" || true
+		docker_stop "${name}" || true
+		run "cat ${MOUNTPOINT}/devilbox"
+		rm -rf "${MOUNTPOINT}"
+		echo "Failed"
+		exit 1
+	fi
+	INDEX="$(( INDEX + 1 ))"
+	sleep 1
+done
+
+
+# Cleanup
+print_h2 "Cleanup"
+docker_stop "${name}"
 rm -rf "${MOUNTPOINT}"

tests/prod/05-test-env-forward_ports_to_localhost.sh

@@ -7,8 +7,10 @@ set -o pipefail
 CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
 
 IMAGE="${1}"
-VERSION="${2}"
-FLAVOUR="${3}"
+ARCH="${2}"
+VERSION="${3}"
+FLAVOUR="${4}"
+TAG="${5}"
 
 # shellcheck disable=SC1090
 . "${CWD}/../.lib.sh"
@@ -22,52 +24,70 @@ FLAVOUR="${3}"
 ###
 ### Socat forwarding
 ###
-CONTAINER="mysql:5.6"
+CONTAINER="devilbox/mysql:mysql-8.0"
 
 # Pull Container
-run "until docker pull ${CONTAINER}; do sleep 1; done"
+print_h2 "Pulling MySQL"
+run "until docker pull --platform ${ARCH} ${CONTAINER}; do sleep 1; done"
 
 # Start mysql container
-mdid="$( docker_run "${CONTAINER}" "-e MYSQL_ALLOW_EMPTY_PASSWORD=yes" )"
-mname="$( docker_name "${mdid}" )"
-run "sleep 5"
+print_h2 "Starting MySQL"
+if ! name_mysql="$( docker_run "${CONTAINER}" "${ARCH}" "-e MYSQL_ALLOW_EMPTY_PASSWORD=yes" )"; then
+	exit 1
+fi
+run "sleep 60"
 
-did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e FORWARD_PORTS_TO_LOCALHOST=3306:${mname}:3306 --link ${mname}" )"
-if ! run "docker logs ${did} 2>&1 | grep 'Forwarding ${mname}:3306'"; then
-	docker_logs "${did}"  || true
-	docker_logs "${mdid}" || true
-	docker_stop "${did}"  || true
-	docker_stop "${mdid}" || true
+
+# Start PHP-FPM
+print_h2 "Start PHP-FPM"
+if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e FORWARD_PORTS_TO_LOCALHOST=3306:${name_mysql}:3306 --link ${name_mysql}" )"; then
+	docker_stop "${name_mysql}"  || true
+	exit 1
+fi
+
+# Check if PHP-FPM is running
+print_h2 "Check if PHP-FPM is running"
+if ! check_php_fpm_running "${name}"; then
+	docker_logs "${name}"  || true
+	docker_stop "${name}"  || true
 	echo "Failed"
 	exit 1
 fi
 
-# Wait for both containers to come up
-run "sleep 10"
+print_h2 "Ensure forwarding info is present in docker logs"
+if ! run "docker logs ${name} 2>&1 | grep 'Forwarding ${name_mysql}:3306'"; then
+	docker_logs "${name_mysql}"  || true
+	docker_logs "${name}"        || true
+	docker_stop "${name_mysql}"  || true
+	docker_stop "${name}"        || true
+	echo "Failed"
+	exit 1
+fi
 
-# Test connectivity
-#docker_exec "${did}" "ping -c 1 ${mname}"
-#docker_exec "${did}" "echo | nc -w 1 ${mname} 3306"
-#docker_exec "${did}" "echo | nc -w 1 127.0.0.1 3306"
 
 # Only work container has mysql binary installed
 if [ "${FLAVOUR}" = "work" ]; then
-	if ! docker_exec "${did}" "mysql --user=root --password= --host=${mname} -e 'SHOW DATABASES;'"; then
-		docker_logs "${did}"  || true
-		docker_logs "${mdid}" || true
-		docker_stop "${did}"  || true
-		docker_stop "${mdid}" || true
+	print_h2 "Test connectivity against hostname"
+	if ! docker_exec "${name}" "mysql --user=root --password= --host=${name_mysql} -e 'SHOW DATABASES;'"; then
+		docker_logs "${name_mysql}"  || true
+		docker_logs "${name}"        || true
+		docker_stop "${name_mysql}"  || true
+		docker_stop "${name}"        || true
 		echo "Failed"
 		exit 1
 	fi
-	if ! docker_exec "${did}" "mysql --user=root --password= --host=127.0.0.1 -e 'SHOW DATABASES;'"; then
-		docker_logs "${did}"  || true
-		docker_logs "${mdid}" || true
-		docker_stop "${did}"  || true
-		docker_stop "${mdid}" || true
+	print_h2 "Test connectivity against 127.0.0.1"
+	if ! docker_exec "${name}" "mysql --user=root --password= --host=127.0.0.1 -e 'SHOW DATABASES;'"; then
+		docker_logs "${name_mysql}"  || true
+		docker_logs "${name}"        || true
+		docker_stop "${name_mysql}"  || true
+		docker_stop "${name}"        || true
 		echo "Failed"
 		exit 1
 	fi
 fi
-docker_stop "${mdid}"
-docker_stop "${did}"
+
+
+print_h2 "Cleanup"
+docker_stop "${name_mysql}"
+docker_stop "${name}"

tests/prod/06-test-mount-custom_ini.sh

@@ -7,8 +7,10 @@ set -o pipefail
 CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
 
 IMAGE="${1}"
-VERSION="${2}"
-FLAVOUR="${3}"
+ARCH="${2}"
+VERSION="${3}"
+FLAVOUR="${4}"
+TAG="${5}"
 
 # shellcheck disable=SC1090
 . "${CWD}/../.lib.sh"
@@ -43,12 +45,25 @@ chmod 0777 "${PHP_INI_HOST}"
 chmod 0777 "${DOC_ROOT_HOST}"
 chmod 0644 "${DOC_ROOT_HOST}/index.php"
 
+
 # Pull container
-run "until docker pull ${CONTAINER}; do sleep 1; done"
+print_h2 "Pulling Nginx"
+run "until docker pull --platform ${ARCH} ${CONTAINER}; do sleep 1; done"
 
 # Start PHP-FPM
-did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT} -v ${PHP_INI_HOST}:${PHP_INI_CONT}" )"
-name="$( docker_name "${did}" )"
+print_h2 "Starting PHP-FPM"
+if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT} -v ${PHP_INI_HOST}:${PHP_INI_CONT}" )"; then
+	exit 1
+fi
+
+# Check if PHP-FPM is running
+print_h2 "Check if PHP-FPM is running"
+if ! check_php_fpm_running "${name}"; then
+	docker_logs "${name}"  || true
+	docker_stop "${name}"  || true
+	echo "Failed"
+	exit 1
+fi
 
 # Nginx.conf
 {
@@ -69,17 +84,21 @@ name="$( docker_name "${did}" )"
 
 
 # Start Nginx
-ndid="$( docker_run "${CONTAINER}" "-v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT} -v ${CONFIG_HOST}:${CONFIG_CONT} -p ${WWW_PORT}:80 --link ${name}" )"
-
+print_h2 "Starting Nginx"
+if ! name_nginx="$( docker_run "${CONTAINER}" "${ARCH}" "-v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT} -v ${CONFIG_HOST}:${CONFIG_CONT} -p ${WWW_PORT}:80 --link ${name}" )"; then
+	docker_stop "${name}"  || true
+	exit 1
+fi
 # Wait for both containers to be up and running
 run "sleep 10"
 
 # Check entrypoint
-if ! run "docker logs ${did} | grep 'post.ini'"; then
-	docker_logs "${ndid}" || true
-	docker_logs "${did}"  || true
-	docker_stop "${ndid}" || true
-	docker_stop "${did}"  || true
+print_h2 "Checking entrypoint"
+if ! run "docker logs ${name} | grep 'post.ini'"; then
+	docker_logs "${name_nginx}" || true
+	docker_logs "${name}"       || true
+	docker_stop "${name_nginx}" || true
+	docker_stop "${name}"       || true
 	rm -rf "${DOC_ROOT_HOST}"
 	rm -rf "${CONFIG_HOST}"
 	rm -rf "${PHP_INI_HOST}"
@@ -88,31 +107,32 @@ if ! run "docker logs ${did} | grep 'post.ini'"; then
 fi
 
 # Check PHP connectivity
+print_h2 "Checking connectivity"
 if ! run "curl -q -4 http://127.0.0.1:${WWW_PORT}/index.php >/dev/null 2>&1"; then
 	# Info
 	run "netstat -tuln"
 	run "curl -4 http://127.0.0.1:${WWW_PORT}/index.php" || true
 	run "curl -6 http://127.0.0.1:${WWW_PORT}/index.php" || true
 	run "docker ps --no-trunc"
-	docker_exec "${ndid}" "nginx -t"
+	docker_exec "${name_nginx}" "nginx -t"
 
 	# Show logs
-	docker_logs "${ndid}" || true
-	docker_logs "${did}"  || true
+	docker_logs "${name_nginx}" || true
+	docker_logs "${name}"       || true
 
 	# Ensure file is available
-	docker_exec "${ndid}" "ls -la ${DOC_ROOT_CONT}/"
-	docker_exec "${did}"  "ls -la ${DOC_ROOT_CONT}/"
+	docker_exec "${name_nginx}" "ls -la ${DOC_ROOT_CONT}/"
+	docker_exec "${name}"       "ls -la ${DOC_ROOT_CONT}/"
 
-	docker_exec "${ndid}" "cat ${DOC_ROOT_CONT}/index.php"
-	docker_exec "${did}"  "cat ${DOC_ROOT_CONT}/index.php"
+	docker_exec "${name_nginx}" "cat ${DOC_ROOT_CONT}/index.php"
+	docker_exec "${name}"       "cat ${DOC_ROOT_CONT}/index.php"
 
 	# Nginx configuration
-	docker_exec "${ndid}" "cat ${CONFIG_CONT}/php.conf"
+	docker_exec "${name_nginx}" "cat ${CONFIG_CONT}/php.conf"
 
 	# Shutdown
-	docker_stop "${ndid}" || true
-	docker_stop "${did}"  || true
+	docker_stop "${name_nginx}" || true
+	docker_stop "${name}"       || true
 	rm -rf "${DOC_ROOT_HOST}"
 	rm -rf "${CONFIG_HOST}"
 	rm -rf "${PHP_INI_HOST}"
@@ -121,17 +141,18 @@ if ! run "curl -q -4 http://127.0.0.1:${WWW_PORT}/index.php >/dev/null 2>&1"; th
 fi
 
 # Check modified php.ini
-if ! docker_exec "${did}" "php -r \"echo ini_get('post_max_size');\" | grep '17M'"; then
+print_h2 "Checking modified php.ini"
+if ! docker_exec "${name}" "php -r \"echo ini_get('post_max_size');\" | grep '17M'"; then
 	# Info
-	docker_exec "${did}" "php -r \"echo ini_get('post_max_size');\""
+	docker_exec "${name}" "php -r \"echo ini_get('post_max_size');\""
 
 	# Show logs
-	docker_logs "${ndid}" || true
-	docker_logs "${did}"  || true
+	docker_logs "${name_nginx}" || true
+	docker_logs "${name}"       || true
 
 	# Shutdown
-	docker_stop "${ndid}" || true
-	docker_stop "${did}"  || true
+	docker_stop "${name_nginx}" || true
+	docker_stop "${name}"       || true
 	rm -rf "${DOC_ROOT_HOST}"
 	rm -rf "${CONFIG_HOST}"
 	rm -rf "${PHP_INI_HOST}"
@@ -140,31 +161,32 @@ if ! docker_exec "${did}" "php -r \"echo ini_get('post_max_size');\" | grep '17M
 fi
 
 # Check modified php.ini
+print_h2 "Checking modified php.ini"
 if ! run "curl -q -4 http://127.0.0.1:${WWW_PORT}/index.php 2>/dev/null | grep post_max_size | grep '17M'"; then
 	# Info
 	run "netstat -tuln"
 	run "curl -4 http://127.0.0.1:${WWW_PORT}/index.php" || true
 	run "curl -6 http://127.0.0.1:${WWW_PORT}/index.php" || true
 	run "docker ps --no-trunc"
-	docker_exec "${ndid}" "nginx -t"
+	docker_exec "${name_nginx}" "nginx -t"
 
 	# Show logs
-	docker_logs "${ndid}" || true
-	docker_logs "${did}"  || true
+	docker_logs "${name_nginx}" || true
+	docker_logs "${name}"       || true
 
 	# Ensure file is available
-	docker_exec "${ndid}" "ls -la ${DOC_ROOT_CONT}/"
-	docker_exec "${did}"  "ls -la ${DOC_ROOT_CONT}/"
+	docker_exec "${name_nginx}" "ls -la ${DOC_ROOT_CONT}/"
+	docker_exec "${name}"       "ls -la ${DOC_ROOT_CONT}/"
 
-	docker_exec "${ndid}" "cat ${DOC_ROOT_CONT}/index.php"
-	docker_exec "${did}"  "cat ${DOC_ROOT_CONT}/index.php"
+	docker_exec "${name_nginx}" "cat ${DOC_ROOT_CONT}/index.php"
+	docker_exec "${name}"       "cat ${DOC_ROOT_CONT}/index.php"
 
 	# Nginx configuration
-	docker_exec "${ndid}" "cat ${CONFIG_CONT}/php.conf"
+	docker_exec "${name_nginx}" "cat ${CONFIG_CONT}/php.conf"
 
 	# Shutdown
-	docker_stop "${ndid}" || true
-	docker_stop "${did}"  || true
+	docker_stop "${name_nginx}" || true
+	docker_stop "${name}"       || true
 	rm -rf "${DOC_ROOT_HOST}"
 	rm -rf "${CONFIG_HOST}"
 	rm -rf "${PHP_INI_HOST}"
@@ -174,8 +196,9 @@ fi
 
 
 # Cleanup
-docker_stop "${did}"
-docker_stop "${ndid}"
+print_h2 "Cleanup"
+docker_stop "${name}"
+docker_stop "${name_nginx}"
 rm -rf "${DOC_ROOT_HOST}"
 rm -rf "${CONFIG_HOST}"
 rm -rf "${PHP_INI_HOST}"

tests/prod/07-test-mount-custom_fpm_conf.sh

@@ -7,8 +7,10 @@ set -o pipefail
 CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
 
 IMAGE="${1}"
-VERSION="${2}"
-FLAVOUR="${3}"
+ARCH="${2}"
+VERSION="${3}"
+FLAVOUR="${4}"
+TAG="${5}"
 
 # shellcheck disable=SC1090
 . "${CWD}/../.lib.sh"
@@ -49,11 +51,23 @@ chmod 0777 "${DOC_ROOT_HOST}"
 chmod 0644 "${DOC_ROOT_HOST}/index.php"
 
 # Pull container
-run "until docker pull ${CONTAINER}; do sleep 1; done"
+print_h2 "Pulling Nginx"
+run "until docker pull --platform ${ARCH} ${CONTAINER}; do sleep 1; done"
 
 # Start PHP-FPM
-did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT} -v ${PHP_CNF_HOST}:${PHP_CNF_CONT}" )"
-name="$( docker_name "${did}" )"
+print_h2 "Starting PHP-FPM"
+if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT} -v ${PHP_CNF_HOST}:${PHP_CNF_CONT}" )"; then
+	exit 1
+fi
+
+# Check if PHP-FPM is running
+print_h2 "Check if PHP-FPM is running"
+if ! check_php_fpm_running "${name}"; then
+	docker_logs "${name}"  || true
+	docker_stop "${name}"  || true
+	echo "Failed"
+	exit 1
+fi
 
 # Nginx.conf
 {
@@ -74,17 +88,21 @@ name="$( docker_name "${did}" )"
 
 
 # Start Nginx
-ndid="$( docker_run "${CONTAINER}" "-v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT} -v ${CONFIG_HOST}:${CONFIG_CONT} -p ${WWW_PORT}:80 --link ${name}" )"
-
+print_h2 "Starting Nginx"
+if ! name_nginx="$( docker_run "${CONTAINER}" "${ARCH}" "-v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT} -v ${CONFIG_HOST}:${CONFIG_CONT} -p ${WWW_PORT}:80 --link ${name}" )"; then
+	docker_stop "${name}"  || true
+	exit 1
+fi
 # Wait for both containers to be up and running
 run "sleep 10"
 
 # Check entrypoint
-if ! run "docker logs ${did} | grep 'post.conf'"; then
-	docker_logs "${ndid}" || true
-	docker_logs "${did}"  || true
-	docker_stop "${ndid}" || true
-	docker_stop "${did}"  || true
+print_h2 "Checking entrypoint"
+if ! run "docker logs ${name} | grep 'post.conf'"; then
+	docker_logs "${name_nginx}" || true
+	docker_logs "${name}"  || true
+	docker_stop "${name_nginx}" || true
+	docker_stop "${name}"  || true
 	rm -rf "${DOC_ROOT_HOST}"
 	rm -rf "${CONFIG_HOST}"
 	rm -rf "${PHP_CNF_HOST}"
@@ -93,31 +111,32 @@ if ! run "docker logs ${did} | grep 'post.conf'"; then
 fi
 
 # Check PHP connectivity
+print_h2 "Checking connectivity"
 if ! run "curl -q -4 http://127.0.0.1:${WWW_PORT}/index.php >/dev/null 2>&1"; then
 	# Info
 	run "netstat -tuln"
 	run "curl -4 http://127.0.0.1:${WWW_PORT}/index.php" || true
 	run "curl -6 http://127.0.0.1:${WWW_PORT}/index.php" || true
 	run "docker ps --no-trunc"
-	docker_exec "${ndid}" "nginx -t"
+	docker_exec "${name_nginx}" "nginx -t"
 
 	# Show logs
-	docker_logs "${ndid}" || true
-	docker_logs "${did}"  || true
+	docker_logs "${name_nginx}" || true
+	docker_logs "${name}"       || true
 
 	# Ensure file is available
-	docker_exec "${ndid}" "ls -la ${DOC_ROOT_CONT}/"
-	docker_exec "${did}"  "ls -la ${DOC_ROOT_CONT}/"
+	docker_exec "${name_nginx}" "ls -la ${DOC_ROOT_CONT}/"
+	docker_exec "${name}"       "ls -la ${DOC_ROOT_CONT}/"
 
-	docker_exec "${ndid}" "cat ${DOC_ROOT_CONT}/index.php"
-	docker_exec "${did}"  "cat ${DOC_ROOT_CONT}/index.php"
+	docker_exec "${name_nginx}" "cat ${DOC_ROOT_CONT}/index.php"
+	docker_exec "${name}"       "cat ${DOC_ROOT_CONT}/index.php"
 
 	# Nginx configuration
-	docker_exec "${ndid}" "cat ${CONFIG_CONT}/php.conf"
+	docker_exec "${name_nginx}" "cat ${CONFIG_CONT}/php.conf"
 
 	# Shutdown
-	docker_stop "${ndid}" || true
-	docker_stop "${did}"  || true
+	docker_stop "${name_nginx}" || true
+	docker_stop "${name}"       || true
 	rm -rf "${DOC_ROOT_HOST}"
 	rm -rf "${CONFIG_HOST}"
 	rm -rf "${PHP_CNF_HOST}"
@@ -125,32 +144,32 @@ if ! run "curl -q -4 http://127.0.0.1:${WWW_PORT}/index.php >/dev/null 2>&1"; th
 	exit 1
 fi
 
-
 # Check modified php-fpm.conf
+print_h2 "Checking modified php-fpm.conf"
 if ! run "curl -q -4 http://127.0.0.1:${WWW_PORT}/index.php 2>/dev/null | grep memory_limit | grep '17M'"; then
 	# Info
 	run "netstat -tuln"
 	run "curl -4 http://127.0.0.1:${WWW_PORT}/index.php | grep memory_limit" || true
 	run "docker ps --no-trunc"
-	docker_exec "${ndid}" "nginx -t"
+	docker_exec "${name_nginx}" "nginx -t"
 
 	# Show logs
-	docker_logs "${ndid}" || true
-	docker_logs "${did}"  || true
+	docker_logs "${name_nginx}" || true
+	docker_logs "${name}"       || true
 
 	# Ensure file is available
-	docker_exec "${ndid}" "ls -la ${DOC_ROOT_CONT}/"
-	docker_exec "${did}"  "ls -la ${DOC_ROOT_CONT}/"
+	docker_exec "${name_nginx}" "ls -la ${DOC_ROOT_CONT}/"
+	docker_exec "${name}"       "ls -la ${DOC_ROOT_CONT}/"
 
-	docker_exec "${ndid}" "cat ${DOC_ROOT_CONT}/index.php"
-	docker_exec "${did}"  "cat ${DOC_ROOT_CONT}/index.php"
+	docker_exec "${name_nginx}" "cat ${DOC_ROOT_CONT}/index.php"
+	docker_exec "${name}"       "cat ${DOC_ROOT_CONT}/index.php"
 
 	# Nginx configuration
-	docker_exec "${ndid}" "cat ${CONFIG_CONT}/php.conf"
+	docker_exec "${name_nginx}" "cat ${CONFIG_CONT}/php.conf"
 
 	# Shutdown
-	docker_stop "${ndid}" || true
-	docker_stop "${did}"  || true
+	docker_stop "${name_nginx}" || true
+	docker_stop "${name}"       || true
 	rm -rf "${DOC_ROOT_HOST}"
 	rm -rf "${CONFIG_HOST}"
 	rm -rf "${PHP_CNF_HOST}"
@@ -160,8 +179,9 @@ fi
 
 
 # Cleanup
-docker_stop "${did}"
-docker_stop "${ndid}"
+print_h2 "Cleanup"
+docker_stop "${name}"
+docker_stop "${name_nginx}"
 rm -rf "${DOC_ROOT_HOST}"
 rm -rf "${CONFIG_HOST}"
 rm -rf "${PHP_CNF_HOST}"

tests/prod/08-test-custom-user-scripts-1.sh

@@ -7,8 +7,10 @@ set -o pipefail
 CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
 
 IMAGE="${1}"
-VERSION="${2}"
-FLAVOUR="${3}"
+ARCH="${2}"
+VERSION="${3}"
+FLAVOUR="${4}"
+TAG="${5}"
 
 # shellcheck disable=SC1090
 . "${CWD}/../.lib.sh"
@@ -33,24 +35,35 @@ printf "#!/bin/bash\\necho 'abcdefghijklmnopq';\\n" > "${RUN_SH_HOST}/myscript1.
 chmod +x "${RUN_SH_HOST}/myscript1.sh"
 
 # Start PHP-FPM
-did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${RUN_SH_HOST}:${RUN_SH_CONT}" )"
+print_h2 "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${RUN_SH_HOST}:${RUN_SH_CONT}"
+if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${RUN_SH_HOST}:${RUN_SH_CONT}" )"; then
+	exit 1
+fi
 
-# Wait for both containers to be up and running
-run "sleep 10"
+# Check if PHP-FPM is running
+print_h2 "Check if PHP-FPM is running"
+if ! check_php_fpm_running "${name}"; then
+	docker_logs "${name}"  || true
+	docker_stop "${name}"  || true
+	echo "Failed"
+	exit 1
+fi
 
 # Check entrypoint for script run
-if ! run "docker logs ${did} | grep 'myscript1.sh'"; then
-	docker_logs "${did}"  || true
-	docker_stop "${did}"  || true
+print_h2 "Check docker logs for script run"
+if ! run "docker logs ${name} | grep 'myscript1.sh'"; then
+	docker_logs "${name}"  || true
+	docker_stop "${name}"  || true
 	rm -rf "${RUN_SH_HOST}"
 	echo "Failed"
 	exit 1
 fi
 
 # Check entrypoint for script output
-if ! run "docker logs ${did} | grep 'abcdefghijklmnopq'"; then
-	docker_logs "${did}"  || true
-	docker_stop "${did}"  || true
+print_h2 "Check docker logs for script output"
+if ! run "docker logs ${name} | grep 'abcdefghijklmnopq'"; then
+	docker_logs "${name}"  || true
+	docker_stop "${name}"  || true
 	rm -rf "${RUN_SH_HOST}"
 	echo "Failed"
 	exit 1
@@ -58,5 +71,6 @@ fi
 
 
 # Cleanup
-docker_stop "${did}"
+print_h2 "Cleanup"
+docker_stop "${name}"
 rm -rf "${RUN_SH_HOST}"

tests/prod/09-test-custom-user-scripts-2.sh

@@ -7,8 +7,10 @@ set -o pipefail
 CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
 
 IMAGE="${1}"
-VERSION="${2}"
-FLAVOUR="${3}"
+ARCH="${2}"
+VERSION="${3}"
+FLAVOUR="${4}"
+TAG="${5}"
 
 # shellcheck disable=SC1090
 . "${CWD}/../.lib.sh"
@@ -33,24 +35,35 @@ printf "#!/bin/bash\\necho 'abcdefghijklmnopq';\\n" > "${RUN_SH_HOST}/myscript1.
 chmod +x "${RUN_SH_HOST}/myscript1.sh"
 
 # Start PHP-FPM
-did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${RUN_SH_HOST}:${RUN_SH_CONT}" )"
+print_h2 "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${RUN_SH_HOST}:${RUN_SH_CONT}"
+if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${RUN_SH_HOST}:${RUN_SH_CONT}" )"; then
+	exit 1
+fi
 
-# Wait for both containers to be up and running
-run "sleep 10"
+# Check if PHP-FPM is running
+print_h2 "Check if PHP-FPM is running"
+if ! check_php_fpm_running "${name}"; then
+	docker_logs "${name}"  || true
+	docker_stop "${name}"  || true
+	echo "Failed"
+	exit 1
+fi
 
 # Check entrypoint for script run
-if ! run "docker logs ${did} | grep 'myscript1.sh'"; then
-	docker_logs "${did}"  || true
-	docker_stop "${did}"  || true
+print_h2 "Check docker logs for script run"
+if ! run "docker logs ${name} | grep 'myscript1.sh'"; then
+	docker_logs "${name}"  || true
+	docker_stop "${name}"  || true
 	rm -rf "${RUN_SH_HOST}"
 	echo "Failed"
 	exit 1
 fi
 
 # Check entrypoint for script output
-if ! run "docker logs ${did} | grep 'abcdefghijklmnopq'"; then
-	docker_logs "${did}"  || true
-	docker_stop "${did}"  || true
+print_h2 "Check docker logs for script output"
+if ! run "docker logs ${name} | grep 'abcdefghijklmnopq'"; then
+	docker_logs "${name}"  || true
+	docker_stop "${name}"  || true
 	rm -rf "${RUN_SH_HOST}"
 	echo "Failed"
 	exit 1
@@ -58,5 +71,6 @@ fi
 
 
 # Cleanup
-docker_stop "${did}"
+print_h2 "Cleanup"
+docker_stop "${name}"
 rm -rf "${RUN_SH_HOST}"

tests/test.sh

@@ -30,8 +30,8 @@ CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
 ###
 ### Sanity check
 ###
-if [ "${#}" -ne "4" ]; then
-	echo "Usage: start.ci <image> <arch> <version> <flavour>"
+if [ "${#}" -ne "5" ]; then
+	echo "Usage: start.ci <image> <arch> <version> <flavour> <tag>"
 	exit 1
 fi
 
@@ -39,47 +39,52 @@ IMAGE="${1}"
 ARCH="${2}"
 VERSION="${3}"
 FLAVOUR="${4}"
+TAG="${5}"
 
 
 ###
 ### Run tests
 ###
 if [ "${FLAVOUR}" = "base" ] || [ "${FLAVOUR}" = "mods" ] || [ "${FLAVOUR}" = "prod" ] || [ "${FLAVOUR}" = "work" ]; then
-	TESTS="$( find ${CWD} -regex "${CWD}/base/[0-9].+.*\.sh" | sort -u )"
+	TESTS="$( find "${CWD}" -regex "${CWD}/base/[0-9].+.*\.sh" | sort -u )"
 	for t in ${TESTS}; do
 		printf "\n\n\033[0;33m%s\033[0m\n" "################################################################################"
-		printf "\033[0;33m%s %s\033[0m\n"  "#" "[${VERSION}-${FLAVOUR}] (${ARCH}): ${t}"
+		printf "\033[0;33m%s %s\033[0m\n"  "#" "[${VERSION}-${FLAVOUR}] (${ARCH})"
+		printf "\033[0;33m%s %s\033[0m\n"  "#" "${t} ${IMAGE} ${ARCH} ${VERSION} ${FLAVOUR} ${TAG}"
 		printf "\033[0;33m%s\033[0m\n\n"   "################################################################################"
-		time ${t} "${IMAGE}" "${VERSION}" "${FLAVOUR}"
+		time ${t} "${IMAGE}" "${ARCH}" "${VERSION}" "${FLAVOUR}" "${TAG}"
 	done
 fi
 
 if [ "${FLAVOUR}" = "mods" ] || [ "${FLAVOUR}" = "prod" ] || [ "${FLAVOUR}" = "work" ]; then
-	TESTS="$( find ${CWD} -regex "${CWD}/mods/[0-9].+.*\.sh" | sort -u )"
+	TESTS="$( find "${CWD}" -regex "${CWD}/mods/[0-9].+.*\.sh" | sort -u )"
 	for t in ${TESTS}; do
 		printf "\n\n\033[0;33m%s\033[0m\n" "################################################################################"
-		printf "\033[0;33m%s %s\033[0m\n"  "#" "[${VERSION}-${FLAVOUR}] (${ARCH}): ${t}"
+		printf "\033[0;33m%s %s\033[0m\n"  "#" "[${VERSION}-${FLAVOUR}] (${ARCH})"
+		printf "\033[0;33m%s %s\033[0m\n"  "#" "${t} ${IMAGE} ${ARCH} ${VERSION} ${FLAVOUR} ${TAG}"
 		printf "\033[0;33m%s\033[0m\n\n"   "################################################################################"
-		time ${t} "${IMAGE}" "${VERSION}" "${FLAVOUR}"
+		time ${t} "${IMAGE}" "${ARCH}" "${VERSION}" "${FLAVOUR}" "${TAG}"
 	done
 fi
 
 if [ "${FLAVOUR}" = "prod" ] || [ "${FLAVOUR}" = "work" ]; then
-	TESTS="$( find ${CWD} -regex "${CWD}/prod/[0-9].+.*\.sh" | sort -u )"
+	TESTS="$( find "${CWD}" -regex "${CWD}/prod/[0-9].+.*\.sh" | sort -u )"
 	for t in ${TESTS}; do
 		printf "\n\n\033[0;33m%s\033[0m\n" "################################################################################"
-		printf "\033[0;33m%s %s\033[0m\n"  "#" "[${VERSION}-${FLAVOUR}] (${ARCH}): ${t}"
+		printf "\033[0;33m%s %s\033[0m\n"  "#" "[${VERSION}-${FLAVOUR}] (${ARCH})"
+		printf "\033[0;33m%s %s\033[0m\n"  "#" "${t} ${IMAGE} ${ARCH} ${VERSION} ${FLAVOUR} ${TAG}"
 		printf "\033[0;33m%s\033[0m\n\n"   "################################################################################"
-		time ${t} "${IMAGE}" "${VERSION}" "${FLAVOUR}"
+		time ${t} "${IMAGE}" "${ARCH}" "${VERSION}" "${FLAVOUR}" "${TAG}"
 	done
 fi
 
 if [ "${FLAVOUR}" = "work" ]; then
-	TESTS="$( find ${CWD} -regex "${CWD}/work/[0-9].+.*\.sh" | sort -u )"
+	TESTS="$( find "${CWD}" -regex "${CWD}/work/[0-9].+.*\.sh" | sort -u )"
 	for t in ${TESTS}; do
 		printf "\n\n\033[0;33m%s\033[0m\n" "################################################################################"
-		printf "\033[0;33m%s %s\033[0m\n"  "#" "[${VERSION}-${FLAVOUR}] (${ARCH}): ${t}"
+		printf "\033[0;33m%s %s\033[0m\n"  "#" "[${VERSION}-${FLAVOUR}] (${ARCH})"
+		printf "\033[0;33m%s %s\033[0m\n"  "#" "${t} ${IMAGE} ${ARCH} ${VERSION} ${FLAVOUR} ${TAG}"
 		printf "\033[0;33m%s\033[0m\n\n"   "################################################################################"
-		time ${t} "${IMAGE}" "${VERSION}" "${FLAVOUR}"
+		time ${t} "${IMAGE}" "${ARCH}" "${VERSION}" "${FLAVOUR}" "${TAG}"
 	done
 fi

tests/work/01-test-env-mysqldump-secure.sh

@@ -7,8 +7,10 @@ set -o pipefail
 CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
 
 IMAGE="${1}"
-VERSION="${2}"
-FLAVOUR="${3}"
+ARCH="${2}"
+VERSION="${3}"
+FLAVOUR="${4}"
+TAG="${5}"
 
 # shellcheck disable=SC1090
 . "${CWD}/../.lib.sh"
@@ -24,35 +26,82 @@ FLAVOUR="${3}"
 ###
 MYSQL_ROOT_PASSWORD="toor"
 MOUNTPOINT="$( mktemp --directory )"
-CONTAINER="mysql:5.6"
+CONTAINER="devilbox/mysql:mysql-8.0"
 
 # Pull Container
-run "until docker pull ${CONTAINER}; do sleep 1; done"
+print_h2 "Pulling MySQL"
+run "until docker pull --platform ${ARCH} ${CONTAINER}; do sleep 1; done"
 
 # Start mysql container
-mdid="$( docker_run "${CONTAINER}" "-e MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" )"
-mname="$( docker_name "${mdid}" )"
-run "sleep 10"
+print_h2 "Starting MySQL"
+if ! name_mysql="$( docker_run "${CONTAINER}" "${ARCH}" "-e MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" )"; then
+	exit 1
+fi
+run "sleep 60"
 
 # Start PHP-FPM container
-did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -e FORWARD_PORTS_TO_LOCALHOST=3306:${mname}:3306 -e MYSQL_BACKUP_USER=root -e MYSQL_BACKUP_PASS=${MYSQL_ROOT_PASSWORD} -e MYSQL_BACKUP_HOST=127.0.0.1 -v ${MOUNTPOINT}:/shared/backups --link ${mname}" )"
+print_h2 "Start PHP-FPM"
+if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -e FORWARD_PORTS_TO_LOCALHOST=3306:${name_mysql}:3306 -e MYSQL_BACKUP_USER=root -e MYSQL_BACKUP_PASS=${MYSQL_ROOT_PASSWORD} -e MYSQL_BACKUP_HOST=127.0.0.1 -v ${MOUNTPOINT}:/shared/backups --link ${name_mysql}" )"; then
+	docker_stop "${name_mysql}"  || true
+	exit 1
+fi
 
-docker_exec "${did}" mysqldump-secure
+# Check if PHP-FPM is running
+print_h2 "Check if PHP-FPM is running"
+if ! check_php_fpm_running "${name}"; then
+	docker_logs "${name}"  || true
+	docker_stop "${name}"  || true
+	echo "Failed"
+	exit 1
+fi
 
-if [ ! -d "${MOUNTPOINT}/mysql" ]; then
-	echo "MySQL backup dir does not exist: ${MOUNTPOINT}/mysql"
-	ls -lap ${MOUNTPOINT}/
-	docker_logs "${did}"  || true
-	docker_logs "${mdid}" || true
-	docker_stop "${did}"  || true
-	docker_stop "${mdid}" || true
+print_h2 "Run mysqldump-secure"
+if ! docker_exec "${name}" "mysqldump-secure -vv"; then
+	docker_logs "${name_mysql}" || true
+	docker_logs "${name}"       || true
+	docker_stop "${name_mysql}" || true
+	docker_stop "${name}"       || true
 	rm -rf "${MOUNTPOINT}"
 	exit 1
 fi
 
-run "ls -lap ${MOUNTPOINT}/mysql/ | grep -E 'mysql\.sql\.gz'"
-run "ls -lap ${MOUNTPOINT}/mysql/ | grep -E 'mysql\.sql\.gz\.info'"
 
-docker_stop "${did}"
-docker_stop "${mdid}"
+print_h2 "Test backup directory"
+if ! run "test -d ${MOUNTPOINT}/mysql"; then
+	echo "MySQL backup dir does not exist: ${MOUNTPOINT}/mysql"
+	ls -lap "${MOUNTPOINT}/"
+	docker_logs "${name_mysql}" || true
+	docker_logs "${name}"       || true
+	docker_stop "${name_mysql}" || true
+	docker_stop "${name}"       || true
+	rm -rf "${MOUNTPOINT}"
+	exit 1
+fi
+
+print_h2 "Grep backup files"
+if ! run "ls -lap ${MOUNTPOINT}/mysql/ | grep -E 'mysql\.sql\.gz'"; then
+	ls -lap "${MOUNTPOINT}/"
+	docker_logs "${name_mysql}" || true
+	docker_logs "${name}"       || true
+	docker_stop "${name_mysql}" || true
+	docker_stop "${name}"       || true
+	rm -rf "${MOUNTPOINT}"
+	exit 1
+fi
+
+print_h2 "Grep info files"
+if ! run "ls -lap ${MOUNTPOINT}/mysql/ | grep -E 'mysql\.sql\.gz\.info'"; then
+	ls -lap "${MOUNTPOINT}/"
+	docker_logs "${name_mysql}" || true
+	docker_logs "${name}"       || true
+	docker_stop "${name_mysql}" || true
+	docker_stop "${name}"       || true
+	rm -rf "${MOUNTPOINT}"
+	exit 1
+fi
+
+
+print_h2 "Cleanup"
+docker_stop "${name_mysql}"
+docker_stop "${name}"
 rm -rf "${MOUNTPOINT}"