From fa523d5506eeb6dc720e376cb1ae1b2b7d3194c4 Mon Sep 17 00:00:00 2001 From: Timon de Groot Date: Thu, 22 Dec 2022 15:56:17 +0100 Subject: [PATCH 1/4] Application: Fix unsupported heredoc indentation level --- src/Application.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Application.php b/src/Application.php index 725e83d..cd25e6e 100644 --- a/src/Application.php +++ b/src/Application.php @@ -31,7 +31,7 @@ class Application Deployer version: %s Deployer Recipe version: %s - NAME; +NAME; /** * Run application From 00344f6f854b90b675f3839b4420cf16adf97a6d Mon Sep 17 00:00:00 2001 From: Timon de Groot Date: Thu, 22 Dec 2022 17:12:25 +0100 Subject: [PATCH 2/4] Backport #24: ci: Fix non-templated tag spec in release_semantic_versions.sh --- ci/release_semantic_versions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/release_semantic_versions.sh b/ci/release_semantic_versions.sh index 9577f0c..76d5d50 100755 --- a/ci/release_semantic_versions.sh +++ b/ci/release_semantic_versions.sh @@ -2,7 +2,7 @@ IMAGE=${IMAGE:-quay.io/hypernode/deploy} INPUT_VERSION=${INPUT_VERSION:-} -TAG_SPECS="php8.1-node18" +TAG_SPECS="php${PHP_VERSION}-node${NODE_VERSION}" if [ ! -n "${INPUT_VERSION}" ]; then echo "No input version provided, stopping". From 326c7b4a249c7a80c616da581a7857da47a30e67 Mon Sep 17 00:00:00 2001 From: Timon de Groot Date: Fri, 23 Dec 2022 14:51:23 +0100 Subject: [PATCH 3/4] Install python3 as default python executable --- ci/build/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci/build/Dockerfile b/ci/build/Dockerfile index db0b78b..8afd724 100644 --- a/ci/build/Dockerfile +++ b/ci/build/Dockerfile @@ -75,6 +75,7 @@ RUN apt-get update && \ patch \ bash \ ca-certificates \ + python3 \ wget \ curl \ openssl \ @@ -131,6 +132,9 @@ RUN curl -sS https://getcomposer.org/installer | php -- --2 --filename=composer2 # Use version 1 for main composer binary RUN ln -s /usr/local/bin/composer1 /usr/local/bin/composer +# Set python3 as default python executable +RUN ln -s /usr/bin/python3 /usr/local/bin/python + # Copy container files COPY ./ci/build/files / From 58859723fa2360b7f74cbb6650725db5f87c1350 Mon Sep 17 00:00:00 2001 From: Timon de Groot Date: Fri, 23 Dec 2022 16:54:05 +0100 Subject: [PATCH 4/4] ci/image: Install python2 --- ci/build/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/build/Dockerfile b/ci/build/Dockerfile index 8afd724..fea220d 100644 --- a/ci/build/Dockerfile +++ b/ci/build/Dockerfile @@ -75,6 +75,7 @@ RUN apt-get update && \ patch \ bash \ ca-certificates \ + python2 \ python3 \ wget \ curl \