From 91741aaf7fcdbb84c2b72ff310ff48cd8be4c390 Mon Sep 17 00:00:00 2001 From: cytopia Date: Mon, 4 Nov 2019 00:53:24 +0100 Subject: [PATCH] Fix phalcon install --- Dockerfiles/work/Dockerfile-5.4 | 2 +- Dockerfiles/work/Dockerfile-5.5 | 3 ++- Dockerfiles/work/Dockerfile-5.6 | 3 ++- Dockerfiles/work/Dockerfile-7.0 | 3 ++- Dockerfiles/work/Dockerfile-7.1 | 3 ++- Dockerfiles/work/Dockerfile-7.2 | 3 ++- build/ansible/group_vars/all/work.yml | 15 ++++++++++++++- 7 files changed, 25 insertions(+), 7 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index f9b6edb..4e87843 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -271,7 +271,7 @@ RUN set -eux \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/phalcon-devtools \ && su - ${MY_USER} -c 'cd /usr/local/src/phalcon-devtools && ./phalcon.sh' \ -&& ln -s /usr/local/src/phalcon-devtools/phalcon.php /usr/local/bin/phalcon \ +&& ln -sf /usr/local/src/phalcon-devtools/phalcon.php /usr/local/bin/phalcon \ && cd / \ && rm -rf /usr/local/src/phalcon-devtools/.git \ \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index d75f615..37deb03 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -275,7 +275,8 @@ RUN set -eux \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/phalcon-devtools \ && su - ${MY_USER} -c 'cd /usr/local/src/phalcon-devtools && ./phalcon.sh' \ -&& ln -s /usr/local/src/phalcon-devtools/phalcon.php /usr/local/bin/phalcon \ +&& ln -sf /usr/local/src/phalcon-devtools/phalcon /usr/local/bin/phalcon \ +&& chmod +x 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 ff2da43..5d83f7e 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -288,7 +288,8 @@ RUN set -eux \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/phalcon-devtools \ && su - ${MY_USER} -c 'cd /usr/local/src/phalcon-devtools && ./phalcon.sh' \ -&& ln -s /usr/local/src/phalcon-devtools/phalcon.php /usr/local/bin/phalcon \ +&& ln -sf /usr/local/src/phalcon-devtools/phalcon /usr/local/bin/phalcon \ +&& chmod +x 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 1c8ee18..918e8ed 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -288,7 +288,8 @@ RUN set -eux \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/phalcon-devtools \ && su - ${MY_USER} -c 'cd /usr/local/src/phalcon-devtools && ./phalcon.sh' \ -&& ln -s /usr/local/src/phalcon-devtools/phalcon.php /usr/local/bin/phalcon \ +&& ln -sf /usr/local/src/phalcon-devtools/phalcon /usr/local/bin/phalcon \ +&& chmod +x 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 4efc3bb..7265524 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -288,7 +288,8 @@ RUN set -eux \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/phalcon-devtools \ && su - ${MY_USER} -c 'cd /usr/local/src/phalcon-devtools && ./phalcon.sh' \ -&& ln -s /usr/local/src/phalcon-devtools/phalcon.php /usr/local/bin/phalcon \ +&& ln -sf /usr/local/src/phalcon-devtools/phalcon /usr/local/bin/phalcon \ +&& chmod +x 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 18307fa..23ab5ba 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -288,7 +288,8 @@ RUN set -eux \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/phalcon-devtools \ && su - ${MY_USER} -c 'cd /usr/local/src/phalcon-devtools && ./phalcon.sh' \ -&& ln -s /usr/local/src/phalcon-devtools/phalcon.php /usr/local/bin/phalcon \ +&& ln -sf /usr/local/src/phalcon-devtools/phalcon /usr/local/bin/phalcon \ +&& chmod +x phalcon \ && cd / \ && rm -rf /usr/local/src/phalcon-devtools/.git \ \ diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index 6615be4..836b4ca 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -584,11 +584,23 @@ software_available: git clone https://github.com/phalcon/phalcon-devtools /usr/local/src/phalcon-devtools \ && cd /usr/local/src/phalcon-devtools \ && git checkout v2.0.7 \ + 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 -s /usr/local/src/phalcon-devtools/phalcon.php /usr/local/bin/phalcon \ + && cd / \ + && rm -rf /usr/local/src/phalcon-devtools/.git \ 5.4: pre: | git clone https://github.com/phalcon/phalcon-devtools /usr/local/src/phalcon-devtools \ && cd /usr/local/src/phalcon-devtools \ && git checkout v2.0.9 \ + 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.php /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 \ @@ -597,7 +609,8 @@ software_available: 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 -s /usr/local/src/phalcon-devtools/phalcon.php /usr/local/bin/phalcon \ + && 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: