diff --git a/docker/Dockerfile.churchcrm-apache-php7-test-debian b/docker/Dockerfile.churchcrm-apache-php7-test-debian deleted file mode 100644 index 57ce3847e0..0000000000 --- a/docker/Dockerfile.churchcrm-apache-php7-test-debian +++ /dev/null @@ -1,31 +0,0 @@ -FROM php:7-apache -LABEL maintainer="george@dawouds.com" - -RUN apt-get update && \ - apt-get install -y \ - libxml2-dev \ - gettext \ - libpng-dev \ - libzip-dev \ - libfreetype6-dev \ - libmcrypt-dev \ - libpng-dev \ - libjpeg-dev \ - libpng-dev - -RUN docker-php-ext-install -j$(nproc) xml exif pdo_mysql gettext iconv mysqli zip -RUN docker-php-ext-configure gd --with-freetype --with-jpeg - -RUN docker-php-ext-install -j$(nproc) gd - -COPY ./apache/default.conf /etc/apache2/apache2.conf - -RUN a2enmod rewrite - -# Configure PHP -RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" - -RUN sed -i 's/^upload_max_filesize.*$/upload_max_filesize = 2G/g' $PHP_INI_DIR/php.ini -RUN sed -i 's/^post_max_size.*$/post_max_size = 2G/g' $PHP_INI_DIR/php.ini -RUN sed -i 's/^memory_limit.*$/memory_limit = 2G/g' $PHP_INI_DIR/php.ini -RUN sed -i 's/^max_execution_time.*$/max_execution_time = 120/g' $PHP_INI_DIR/php.ini diff --git a/docker/docker-compose.test-php7-apache.yaml b/docker/docker-compose.test-php7-apache.yaml deleted file mode 100644 index 4c5c23227d..0000000000 --- a/docker/docker-compose.test-php7-apache.yaml +++ /dev/null @@ -1,32 +0,0 @@ -# This is the developer docker-compose.yml file. You can build and Run ChurchCRM -# from this file by first filling in your password and db info in the .env -# file and then running "docker-compose -f docker-compose.develop.yaml build", and -# "docker-compose -f docker-compose.develop.yaml up" in your terminal. -version: "3.6" -services: - database: - image: mariadb - ports: - - "3306:3306" - env_file: - - .env - networks: - - default - volumes: - - ../demo:/docker-entrypoint-initdb.d # auto-load the demo database as per: https://hub.docker.com/_/mariadb - - webserver: - ## Look into: https://hub.docker.com/r/nimmis/apache-php7 - build: - context: . - dockerfile: Dockerfile.churchcrm-apache-php7-test-debian - image: churchcrm/crm:php7-debian - ports: - - "80:80" - volumes: - - ../src:/var/www/html - - ..:/home/ChurchCRM - links: - - database - env_file: - - .env diff --git a/install/ubuntu.sh b/install/ubuntu.sh index f58c87bd62..e2f0dfc0a8 100644 --- a/install/ubuntu.sh +++ b/install/ubuntu.sh @@ -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 diff --git a/package.json b/package.json index 7a881175a6..23be85bf49 100644 --- a/package.json +++ b/package.json @@ -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",