From 7c498fd36982fcb8e01c99d6cc5b7c894f195084 Mon Sep 17 00:00:00 2001 From: cytopia Date: Tue, 15 May 2018 00:27:51 +0200 Subject: [PATCH] Fix photon cli installation --- Dockerfiles/work/Dockerfile-5.3 | 3 ++- Dockerfiles/work/Dockerfile-5.4 | 3 ++- 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 ++- Dockerfiles/work/Dockerfile-7.3 | 3 ++- build/ansible/group_vars/all.yml | 3 ++- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 20ad11c..58c35d4 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -189,7 +189,8 @@ RUN set -x \ \ # photon && COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ -ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ +&& sed -i'' 's/localhost/127.0.0.1/g' /usr/local/src/composer/vendor/photoncms/installer/src/Installer.php \ +&& ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ \ # sass && gem install sass \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 7dbc594..8378068 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -199,7 +199,8 @@ RUN set -x \ \ # photon && COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ -ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ +&& sed -i'' 's/localhost/127.0.0.1/g' /usr/local/src/composer/vendor/photoncms/installer/src/Installer.php \ +&& ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ \ # sass && gem install sass \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 35b36fb..4b38a89 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -202,7 +202,8 @@ RUN set -x \ \ # photon && COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ -ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ +&& sed -i'' 's/localhost/127.0.0.1/g' /usr/local/src/composer/vendor/photoncms/installer/src/Installer.php \ +&& ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ \ # sass && gem install sass \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index ff986a8..f1507b5 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -202,7 +202,8 @@ RUN set -x \ \ # photon && COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ -ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ +&& sed -i'' 's/localhost/127.0.0.1/g' /usr/local/src/composer/vendor/photoncms/installer/src/Installer.php \ +&& ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ \ # sass && gem install sass \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 0c34b70..0903d6f 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -202,7 +202,8 @@ RUN set -x \ \ # photon && COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ -ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ +&& sed -i'' 's/localhost/127.0.0.1/g' /usr/local/src/composer/vendor/photoncms/installer/src/Installer.php \ +&& ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ \ # sass && gem install sass \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 03e852e..cd1168b 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -202,7 +202,8 @@ RUN set -x \ \ # photon && COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ -ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ +&& sed -i'' 's/localhost/127.0.0.1/g' /usr/local/src/composer/vendor/photoncms/installer/src/Installer.php \ +&& ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ \ # sass && gem install sass \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index b74681e..9f7a899 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -202,7 +202,8 @@ RUN set -x \ \ # photon && COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ -ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ +&& sed -i'' 's/localhost/127.0.0.1/g' /usr/local/src/composer/vendor/photoncms/installer/src/Installer.php \ +&& ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ \ # sass && gem install sass \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index d6de205..d140e1a 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -191,7 +191,8 @@ RUN set -x \ \ # photon && COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ -ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ +&& sed -i'' 's/localhost/127.0.0.1/g' /usr/local/src/composer/vendor/photoncms/installer/src/Installer.php \ +&& ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ \ # sass && gem install sass \ diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index dc7f37e..ad00fba 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -339,7 +339,8 @@ software_available: all: command: | COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ - ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ + && sed -i'' 's/localhost/127.0.0.1/g' /usr/local/src/composer/vendor/photoncms/installer/src/Installer.php \ + && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ sass: check: sass --version | grep -E '[.0-9]+' all: