From 4165b8c011a0f1dcba29f1d5e9348a3ac43731e4 Mon Sep 17 00:00:00 2001 From: marc tobias Date: Fri, 7 Feb 2020 15:18:46 +0100 Subject: [PATCH] CentOS7: update from PHP 5.4 to 7.2 --- vagrant/Install-on-Centos-7.sh | 19 +++++++++++++++---- vagrant/Install-on-Centos-8.sh | 9 +++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/vagrant/Install-on-Centos-7.sh b/vagrant/Install-on-Centos-7.sh index 97d3e796..e2592f65 100755 --- a/vagrant/Install-on-Centos-7.sh +++ b/vagrant/Install-on-Centos-7.sh @@ -23,6 +23,12 @@ sudo yum install -y https://download.postgresql.org/pub/repos/yum/11/redhat/rhel-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm sudo yum install -y centos-release-scl-rh +# More repositories for PHP 7 (default is PHP 5.4) + + sudo yum install -y http://rpms.remirepo.net/enterprise/remi-release-7.rpm + sudo yum-config-manager --enable remi-php72 + sudo yum update -y + # Now you can install all packages needed for Nominatim: #DOCS: :::sh @@ -33,23 +39,28 @@ devtoolset-7 llvm-toolset-7 \ php-pgsql php php-intl libpqxx-devel \ proj-epsg bzip2-devel proj-devel boost-devel \ + python3-pip python3-setuptools python3-devel \ expat-devel zlib-devel # make sure pg_config gets found - echo 'PATH=/usr/pgsql-11/bin/$PATH' >> ~/.bash_profile + echo 'PATH=/usr/pgsql-11/bin/:$PATH' >> ~/.bash_profile source ~/.bash_profile + pip3 install --user psycopg2 pytidylib + # If you want to run the test suite, you need to install the following # additional packages: #DOCS: :::sh - sudo yum install -y python34-pip python34-setuptools python34-devel \ - php-phpunit-PHPUnit - pip3 install --user behave nose pytidylib psycopg2 + sudo yum install -y php-dom php-mbstring + pip3 install --user behave nose composer global require "squizlabs/php_codesniffer=*" sudo ln -s ~/.config/composer/vendor/bin/phpcs /usr/bin/ + composer global require "phpunit/phpunit=7.*" + sudo ln -s ~/.config/composer/vendor/bin/phpunit /usr/bin/ + # # System Configuration # ==================== diff --git a/vagrant/Install-on-Centos-8.sh b/vagrant/Install-on-Centos-8.sh index 9c4972dc..fdfec24b 100755 --- a/vagrant/Install-on-Centos-8.sh +++ b/vagrant/Install-on-Centos-8.sh @@ -32,20 +32,21 @@ llvm-toolset ccache clang-tools-extra \ php-pgsql php php-intl php-json libpq-devel \ proj52-epsg bzip2-devel proj-devel boost-devel \ + python3-pip python3-setuptools python3-devel \ expat-devel zlib-devel # make sure pg_config gets found echo 'PATH=/usr/pgsql-10/bin:$PATH' >> ~/.bash_profile source ~/.bash_profile + pip3 install --user psycopg2 pytidylib + # If you want to run the test suite, you need to install the following # additional packages: #DOCS: :::sh - sudo dnf install -y python36 python3-pip python3-setuptools python36-devel \ - php-dom php-mbstring - - pip3 install --user behave nose pytidylib psycopg2 + sudo dnf install -y php-dom php-mbstring + pip3 install --user behave nose composer global require "squizlabs/php_codesniffer=*" sudo ln -s ~/.config/composer/vendor/bin/phpcs /usr/bin/ -- 2.39.5