From a59e71ef351449a449506f01fe464446ec2da957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20=C5=A0trauch?= <cx@initd.cz>
Date: Mon, 14 Sep 2020 14:18:38 +0200
Subject: [PATCH] Adding Composer into PHP

---
 Makefile         | 2 +-
 build_php.sh     | 4 ++++
 etc/bashrc_local | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 8600d9f..6b8201a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 DOCKER=docker
-VERSION=2020.09-1
+VERSION=2020.09-2
 
 all: build
 
diff --git a/build_php.sh b/build_php.sh
index b720e83..44eab0e 100755
--- a/build_php.sh
+++ b/build_php.sh
@@ -70,6 +70,10 @@ make install
 mkdir -p /opt/techs/php-$VERSION/etc/conf.d/
 ln -s /srv/conf/php-fpm/php.ini /opt/techs/php-$VERSION/etc/conf.d/app.ini
 
+cd /opt/techs/php-$VERSION/bin
+curl -s https://getcomposer.org/installer | ./php -d allow_url_fopen=On
+cd -
+
 echo "no" | /opt/techs/php-$VERSION/bin/pecl install redis
 
 echo "extension=redis.so" > /opt/techs/php-$VERSION/etc/conf.d/extensions.ini
diff --git a/etc/bashrc_local b/etc/bashrc_local
index 763973c..f81b7e1 100644
--- a/etc/bashrc_local
+++ b/etc/bashrc_local
@@ -1,4 +1,4 @@
-export PATH=/srv/bin/primary_tech:/srv/bin/primary_tech/sbin:$PATH:/usr/sbin:/sbin
+export PATH=/srv/bin/primary_tech:/srv/bin/primary_tech/sbin:/srv/bin:$PATH:/usr/sbin:/sbin
 
 # Use only if the shell is opened via SSH
 if [ -n "$SSH_TTY" ]; then