Skip to content

Commit 91741aa

Browse files
committed
Fix phalcon install
1 parent 87234a6 commit 91741aa

7 files changed

Lines changed: 25 additions & 7 deletions

File tree

Dockerfiles/work/Dockerfile-5.4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ RUN set -eux \
271271
\
272272
&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/phalcon-devtools \
273273
&& su - ${MY_USER} -c 'cd /usr/local/src/phalcon-devtools && ./phalcon.sh' \
274-
&& ln -s /usr/local/src/phalcon-devtools/phalcon.php /usr/local/bin/phalcon \
274+
&& ln -sf /usr/local/src/phalcon-devtools/phalcon.php /usr/local/bin/phalcon \
275275
&& cd / \
276276
&& rm -rf /usr/local/src/phalcon-devtools/.git \
277277
\

Dockerfiles/work/Dockerfile-5.5

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,8 @@ RUN set -eux \
275275
\
276276
&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/phalcon-devtools \
277277
&& su - ${MY_USER} -c 'cd /usr/local/src/phalcon-devtools && ./phalcon.sh' \
278-
&& ln -s /usr/local/src/phalcon-devtools/phalcon.php /usr/local/bin/phalcon \
278+
&& ln -sf /usr/local/src/phalcon-devtools/phalcon /usr/local/bin/phalcon \
279+
&& chmod +x phalcon \
279280
&& cd / \
280281
&& rm -rf /usr/local/src/phalcon-devtools/.git \
281282
\

Dockerfiles/work/Dockerfile-5.6

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,8 @@ RUN set -eux \
288288
\
289289
&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/phalcon-devtools \
290290
&& su - ${MY_USER} -c 'cd /usr/local/src/phalcon-devtools && ./phalcon.sh' \
291-
&& ln -s /usr/local/src/phalcon-devtools/phalcon.php /usr/local/bin/phalcon \
291+
&& ln -sf /usr/local/src/phalcon-devtools/phalcon /usr/local/bin/phalcon \
292+
&& chmod +x phalcon \
292293
&& cd / \
293294
&& rm -rf /usr/local/src/phalcon-devtools/.git \
294295
\

Dockerfiles/work/Dockerfile-7.0

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,8 @@ RUN set -eux \
288288
\
289289
&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/phalcon-devtools \
290290
&& su - ${MY_USER} -c 'cd /usr/local/src/phalcon-devtools && ./phalcon.sh' \
291-
&& ln -s /usr/local/src/phalcon-devtools/phalcon.php /usr/local/bin/phalcon \
291+
&& ln -sf /usr/local/src/phalcon-devtools/phalcon /usr/local/bin/phalcon \
292+
&& chmod +x phalcon \
292293
&& cd / \
293294
&& rm -rf /usr/local/src/phalcon-devtools/.git \
294295
\

Dockerfiles/work/Dockerfile-7.1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,8 @@ RUN set -eux \
288288
\
289289
&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/phalcon-devtools \
290290
&& su - ${MY_USER} -c 'cd /usr/local/src/phalcon-devtools && ./phalcon.sh' \
291-
&& ln -s /usr/local/src/phalcon-devtools/phalcon.php /usr/local/bin/phalcon \
291+
&& ln -sf /usr/local/src/phalcon-devtools/phalcon /usr/local/bin/phalcon \
292+
&& chmod +x phalcon \
292293
&& cd / \
293294
&& rm -rf /usr/local/src/phalcon-devtools/.git \
294295
\

Dockerfiles/work/Dockerfile-7.2

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,8 @@ RUN set -eux \
288288
\
289289
&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/phalcon-devtools \
290290
&& su - ${MY_USER} -c 'cd /usr/local/src/phalcon-devtools && ./phalcon.sh' \
291-
&& ln -s /usr/local/src/phalcon-devtools/phalcon.php /usr/local/bin/phalcon \
291+
&& ln -sf /usr/local/src/phalcon-devtools/phalcon /usr/local/bin/phalcon \
292+
&& chmod +x phalcon \
292293
&& cd / \
293294
&& rm -rf /usr/local/src/phalcon-devtools/.git \
294295
\

build/ansible/group_vars/all/work.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,11 +584,23 @@ software_available:
584584
git clone https://github.com/phalcon/phalcon-devtools /usr/local/src/phalcon-devtools \
585585
&& cd /usr/local/src/phalcon-devtools \
586586
&& git checkout v2.0.7 \
587+
command: |
588+
chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/phalcon-devtools \
589+
&& su - ${MY_USER} -c 'cd /usr/local/src/phalcon-devtools && ./phalcon.sh' \
590+
&& ln -s /usr/local/src/phalcon-devtools/phalcon.php /usr/local/bin/phalcon \
591+
&& cd / \
592+
&& rm -rf /usr/local/src/phalcon-devtools/.git \
587593
5.4:
588594
pre: |
589595
git clone https://github.com/phalcon/phalcon-devtools /usr/local/src/phalcon-devtools \
590596
&& cd /usr/local/src/phalcon-devtools \
591597
&& git checkout v2.0.9 \
598+
command: |
599+
chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/phalcon-devtools \
600+
&& su - ${MY_USER} -c 'cd /usr/local/src/phalcon-devtools && ./phalcon.sh' \
601+
&& ln -sf /usr/local/src/phalcon-devtools/phalcon.php /usr/local/bin/phalcon \
602+
&& cd / \
603+
&& rm -rf /usr/local/src/phalcon-devtools/.git \
592604
all:
593605
pre: |
594606
git clone https://github.com/phalcon/phalcon-devtools /usr/local/src/phalcon-devtools \
@@ -597,7 +609,8 @@ software_available:
597609
command: |
598610
chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/phalcon-devtools \
599611
&& su - ${MY_USER} -c 'cd /usr/local/src/phalcon-devtools && ./phalcon.sh' \
600-
&& ln -s /usr/local/src/phalcon-devtools/phalcon.php /usr/local/bin/phalcon \
612+
&& ln -sf /usr/local/src/phalcon-devtools/phalcon /usr/local/bin/phalcon \
613+
&& chmod +x phalcon \
601614
&& cd / \
602615
&& rm -rf /usr/local/src/phalcon-devtools/.git \
603616
phpcs:

0 commit comments

Comments
 (0)