From 9750db0b4a28651704acdf11c61df4a8d20a1315 Mon Sep 17 00:00:00 2001 From: Igor Vitol Date: Thu, 13 Apr 2023 15:58:57 +0300 Subject: [PATCH] Adding JQ command to PHP CLI image --- images/php/7.2-cli/Dockerfile | 1 + images/php/7.2-cli/docker-entrypoint.sh | 1 + images/php/7.3-cli/Dockerfile | 1 + images/php/7.3-cli/docker-entrypoint.sh | 1 + images/php/7.4-cli/Dockerfile | 1 + images/php/8.0-cli/Dockerfile | 1 + images/php/8.1-cli/Dockerfile | 1 + images/php/8.2-cli/Dockerfile | 1 + src/Command/Image/GeneratePhp.php | 1 + 9 files changed, 9 insertions(+) diff --git a/images/php/7.2-cli/Dockerfile b/images/php/7.2-cli/Dockerfile index d474c800..53196950 100644 --- a/images/php/7.2-cli/Dockerfile +++ b/images/php/7.2-cli/Dockerfile @@ -52,6 +52,7 @@ RUN apt-get update \ unzip \ vim \ openssh-client \ + jq \ gnupg2 \ ca-certificates \ lsb-release \ diff --git a/images/php/7.2-cli/docker-entrypoint.sh b/images/php/7.2-cli/docker-entrypoint.sh index 1e025ca7..f26def5d 100644 --- a/images/php/7.2-cli/docker-entrypoint.sh +++ b/images/php/7.2-cli/docker-entrypoint.sh @@ -19,6 +19,7 @@ fi # Configure composer [ ! -z "${COMPOSER_VERSION}" ] && \ + composer clearcache && \ composer self-update $COMPOSER_VERSION [ ! -z "${COMPOSER_GITHUB_TOKEN}" ] && \ diff --git a/images/php/7.3-cli/Dockerfile b/images/php/7.3-cli/Dockerfile index 065b9b45..58505789 100644 --- a/images/php/7.3-cli/Dockerfile +++ b/images/php/7.3-cli/Dockerfile @@ -52,6 +52,7 @@ RUN apt-get update \ unzip \ vim \ openssh-client \ + jq \ gnupg2 \ ca-certificates \ lsb-release \ diff --git a/images/php/7.3-cli/docker-entrypoint.sh b/images/php/7.3-cli/docker-entrypoint.sh index 1e025ca7..f26def5d 100644 --- a/images/php/7.3-cli/docker-entrypoint.sh +++ b/images/php/7.3-cli/docker-entrypoint.sh @@ -19,6 +19,7 @@ fi # Configure composer [ ! -z "${COMPOSER_VERSION}" ] && \ + composer clearcache && \ composer self-update $COMPOSER_VERSION [ ! -z "${COMPOSER_GITHUB_TOKEN}" ] && \ diff --git a/images/php/7.4-cli/Dockerfile b/images/php/7.4-cli/Dockerfile index 108426f4..9ccdd05a 100644 --- a/images/php/7.4-cli/Dockerfile +++ b/images/php/7.4-cli/Dockerfile @@ -52,6 +52,7 @@ RUN apt-get update \ unzip \ vim \ openssh-client \ + jq \ gnupg2 \ ca-certificates \ lsb-release \ diff --git a/images/php/8.0-cli/Dockerfile b/images/php/8.0-cli/Dockerfile index e00a862f..7f1977b9 100644 --- a/images/php/8.0-cli/Dockerfile +++ b/images/php/8.0-cli/Dockerfile @@ -52,6 +52,7 @@ RUN apt-get update \ unzip \ vim \ openssh-client \ + jq \ gnupg2 \ ca-certificates \ lsb-release \ diff --git a/images/php/8.1-cli/Dockerfile b/images/php/8.1-cli/Dockerfile index 651f17d9..3d8ac4a4 100644 --- a/images/php/8.1-cli/Dockerfile +++ b/images/php/8.1-cli/Dockerfile @@ -52,6 +52,7 @@ RUN apt-get update \ unzip \ vim \ openssh-client \ + jq \ gnupg2 \ ca-certificates \ lsb-release \ diff --git a/images/php/8.2-cli/Dockerfile b/images/php/8.2-cli/Dockerfile index f5bebb6a..bd54aa77 100644 --- a/images/php/8.2-cli/Dockerfile +++ b/images/php/8.2-cli/Dockerfile @@ -52,6 +52,7 @@ RUN apt-get update \ unzip \ vim \ openssh-client \ + jq \ gnupg2 \ ca-certificates \ lsb-release \ diff --git a/src/Command/Image/GeneratePhp.php b/src/Command/Image/GeneratePhp.php index e33e4c33..5470e557 100644 --- a/src/Command/Image/GeneratePhp.php +++ b/src/Command/Image/GeneratePhp.php @@ -66,6 +66,7 @@ class GeneratePhp extends Command 'unzip', 'vim', 'openssh-client', + 'jq' ]; private const PHP_EXTENSIONS_ENABLED_BY_DEFAULT = [