From a382745a2f9f595cf21951ad77fb78a5773a55eb Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 27 Dec 2019 17:19:45 +0100 Subject: [PATCH] Fix phalcon-devtools install --- Dockerfiles/work/Dockerfile-5.5 | 4 +-- Dockerfiles/work/Dockerfile-5.6 | 4 +-- Dockerfiles/work/Dockerfile-7.0 | 4 +-- Dockerfiles/work/Dockerfile-7.1 | 4 +-- Dockerfiles/work/Dockerfile-7.2 | 1 + build/ansible/group_vars/all/work.yml | 49 +++++++++++++++++++++++++++ 6 files changed, 58 insertions(+), 8 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 12bbd7f2..7cf129b3 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -272,12 +272,12 @@ RUN set -eux \ # -------------------- 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) \ +&& git checkout v3.4.11 \ \ && 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 \ +&& chmod +x /usr/local/bin/phalcon \ && cd / \ && rm -rf /usr/local/src/phalcon-devtools/.git \ \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index e38215a1..8fce4d6b 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -285,12 +285,12 @@ RUN set -eux \ # -------------------- 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) \ +&& git checkout v3.4.11 \ \ && 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 \ +&& chmod +x /usr/local/bin/phalcon \ && cd / \ && rm -rf /usr/local/src/phalcon-devtools/.git \ \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index c370a6a9..2482e2a4 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -285,12 +285,12 @@ RUN set -eux \ # -------------------- 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) \ +&& git checkout v3.4.11 \ \ && 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 \ +&& chmod +x /usr/local/bin/phalcon \ && cd / \ && rm -rf /usr/local/src/phalcon-devtools/.git \ \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index f492189d..afd2dfea 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -285,12 +285,12 @@ RUN set -eux \ # -------------------- 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) \ +&& git checkout v3.4.11 \ \ && 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 \ +&& chmod +x /usr/local/bin/phalcon \ && cd / \ && rm -rf /usr/local/src/phalcon-devtools/.git \ \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 67cb4e72..b9a2684b 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -286,6 +286,7 @@ RUN set -eux \ && 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 install \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/phalcon-devtools \ && su - ${MY_USER} -c 'cd /usr/local/src/phalcon-devtools && ./phalcon.sh' \ diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index 9976a48b..bdd4ebf2 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -623,11 +623,60 @@ software_available: && ln -sf /usr/local/src/phalcon-devtools/phalcon.php /usr/local/bin/phalcon \ && cd / \ && rm -rf /usr/local/src/phalcon-devtools/.git \ + 5.5: + pre: | + git clone https://github.com/phalcon/phalcon-devtools /usr/local/src/phalcon-devtools \ + && cd /usr/local/src/phalcon-devtools \ + && git checkout v3.4.11 \ + command: | + 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 /usr/local/bin/phalcon \ + && cd / \ + && rm -rf /usr/local/src/phalcon-devtools/.git \ + 5.6: + pre: | + git clone https://github.com/phalcon/phalcon-devtools /usr/local/src/phalcon-devtools \ + && cd /usr/local/src/phalcon-devtools \ + && git checkout v3.4.11 \ + command: | + 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 /usr/local/bin/phalcon \ + && cd / \ + && rm -rf /usr/local/src/phalcon-devtools/.git \ + 7.0: + pre: | + git clone https://github.com/phalcon/phalcon-devtools /usr/local/src/phalcon-devtools \ + && cd /usr/local/src/phalcon-devtools \ + && git checkout v3.4.11 \ + command: | + 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 /usr/local/bin/phalcon \ + && cd / \ + && rm -rf /usr/local/src/phalcon-devtools/.git \ + 7.1: + pre: | + git clone https://github.com/phalcon/phalcon-devtools /usr/local/src/phalcon-devtools \ + && cd /usr/local/src/phalcon-devtools \ + && git checkout v3.4.11 \ + command: | + 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 /usr/local/bin/phalcon \ + && cd / \ + && rm -rf /usr/local/src/phalcon-devtools/.git \ all: pre: | 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 install \ command: | chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/phalcon-devtools \ && su - ${MY_USER} -c 'cd /usr/local/src/phalcon-devtools && ./phalcon.sh' \