Skip to content

Commit

Permalink
Merge pull request #6576 from DAcodedBEAT/fix-docker
Browse files Browse the repository at this point in the history
Remove php 7 from scripts
  • Loading branch information
DawoudIO committed Oct 28, 2023
2 parents 44f7981 + f641941 commit a8fc524
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 75 deletions.
31 changes: 0 additions & 31 deletions docker/Dockerfile.churchcrm-apache-php7-test-debian

This file was deleted.

32 changes: 0 additions & 32 deletions docker/docker-compose.test-php7-apache.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions install/ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@ sudo apt install unzip wget git -y
sudo apt install apache2 -y
sudo apt install mysql-server -y

########### un-comment if you are using php7.4#######
#sudo apt install software-properties-common -y
#sudo add-apt-repository ppa:ondrej/php -y
#sudo apt update
#sudo apt install php7.4 libapache2-mod-php7.4 php7.4-mysql php7.4-xml php7.4-zip php7.4-curl php7.4-gd php7.4-mbstring php7.4-cli -y
######################################################


sudo apt install php libapache2-mod-php -y
sudo apt install php-curl php-cli php-dev php-gd php-intl php-json php-mysql php-bcmath php-mbstring php-soap php-xml php-zip -y
cd /tmp
Expand Down
4 changes: 0 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@
"docker-dev-login-db": "docker-compose -f docker/docker-compose.dev-php8-apache.yaml exec database bash",
"docker-dev-logs": "docker-compose -f docker/docker-compose.dev-php8-apache.yaml logs -f --tail=10",
"docker-dev-stop": "docker-compose -f docker/docker-compose.dev-php8-apache.yaml stop",
"docker-test7-start": "cp docker/Config.php src/Include/Config.php && docker-compose -f docker/docker-compose.test-php7-apache.yaml up -d",
"docker-test7-down": "docker-compose -f docker/docker-compose.test-php7-apache.yaml down -v",
"docker-test7-restart": "npm run docker-test7-down && npm run docker-test7-start",
"test-via-docker7-ui": "npm run docker-test7-restart && cp docker/cypress.config.ts cypress.config.ts && node_modules/cypress/bin/cypress open",

"docker-test-build": "docker-compose -f docker/docker-compose.test-php8-apache.yaml build",

Expand Down

0 comments on commit a8fc524

Please sign in to comment.