From e92c6c142232eeff95521275899ad3d0073eff59 Mon Sep 17 00:00:00 2001 From: Palomino Date: Wed, 22 Jan 2020 23:00:15 -0600 Subject: [PATCH 01/13] Restructuracion --- .gitignore | 1 - .../apache/.docker}/bin/fix-permission | 0 .../apache/.docker}/bin/install-magento2 | 0 .../apache/.docker}/bin/opcache | 0 .../apache/.docker}/bin/redis-flush | 0 .../apache/.docker}/bin/xdebug | 0 .../apache/.docker}/config/custom-xdebug.ini | 0 .../apache/.docker}/config/magento.conf | 0 .../apache/.docker}/config/opcache.ini | 0 .../apache/.docker}/config/php.ini | 0 .../apache/.docker}/users/.bashrc | 0 .../apache/.docker}/users/env.sample.php | 0 Dockerfile => Dockerfile/apache/Dockerfile | 8 +- chikatana | 107 ++++++++++++++++++ composer | 2 - docker-compose.elasticsearch.yml | 2 +- env.sample.php => env/magento/env.sample.php | 0 grunt | 12 -- grunt-init | 4 - kill | 3 - magento | 2 - n98 | 2 - opcache | 3 - .../elasticsearch}/.gitignore | 0 shell | 7 -- start | 15 --- stop | 2 - xdebug | 3 - 28 files changed, 113 insertions(+), 60 deletions(-) rename {.docker => Dockerfile/apache/.docker}/bin/fix-permission (100%) rename {.docker => Dockerfile/apache/.docker}/bin/install-magento2 (100%) mode change 100755 => 100644 rename {.docker => Dockerfile/apache/.docker}/bin/opcache (100%) mode change 100755 => 100644 rename {.docker => Dockerfile/apache/.docker}/bin/redis-flush (100%) rename {.docker => Dockerfile/apache/.docker}/bin/xdebug (100%) mode change 100755 => 100644 rename {.docker => Dockerfile/apache/.docker}/config/custom-xdebug.ini (100%) mode change 100755 => 100644 rename {.docker => Dockerfile/apache/.docker}/config/magento.conf (100%) mode change 100755 => 100644 rename {.docker => Dockerfile/apache/.docker}/config/opcache.ini (100%) mode change 100755 => 100644 rename {.docker => Dockerfile/apache/.docker}/config/php.ini (100%) mode change 100755 => 100644 rename {.docker => Dockerfile/apache/.docker}/users/.bashrc (100%) mode change 100755 => 100644 rename {.docker => Dockerfile/apache/.docker}/users/env.sample.php (100%) mode change 100755 => 100644 rename Dockerfile => Dockerfile/apache/Dockerfile (96%) mode change 100755 => 100644 create mode 100644 chikatana delete mode 100755 composer rename env.sample.php => env/magento/env.sample.php (100%) mode change 100755 => 100644 delete mode 100755 grunt delete mode 100755 grunt-init delete mode 100755 kill delete mode 100755 magento delete mode 100755 n98 delete mode 100755 opcache rename {elasticsearchdata => server/elasticsearch}/.gitignore (100%) delete mode 100755 shell delete mode 100755 start delete mode 100755 stop delete mode 100755 xdebug diff --git a/.gitignore b/.gitignore index c228a97c263..a968c372148 100755 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /src/* .DS_Store /.idea -/docker-compose.yml diff --git a/.docker/bin/fix-permission b/Dockerfile/apache/.docker/bin/fix-permission similarity index 100% rename from .docker/bin/fix-permission rename to Dockerfile/apache/.docker/bin/fix-permission diff --git a/.docker/bin/install-magento2 b/Dockerfile/apache/.docker/bin/install-magento2 old mode 100755 new mode 100644 similarity index 100% rename from .docker/bin/install-magento2 rename to Dockerfile/apache/.docker/bin/install-magento2 diff --git a/.docker/bin/opcache b/Dockerfile/apache/.docker/bin/opcache old mode 100755 new mode 100644 similarity index 100% rename from .docker/bin/opcache rename to Dockerfile/apache/.docker/bin/opcache diff --git a/.docker/bin/redis-flush b/Dockerfile/apache/.docker/bin/redis-flush similarity index 100% rename from .docker/bin/redis-flush rename to Dockerfile/apache/.docker/bin/redis-flush diff --git a/.docker/bin/xdebug b/Dockerfile/apache/.docker/bin/xdebug old mode 100755 new mode 100644 similarity index 100% rename from .docker/bin/xdebug rename to Dockerfile/apache/.docker/bin/xdebug diff --git a/.docker/config/custom-xdebug.ini b/Dockerfile/apache/.docker/config/custom-xdebug.ini old mode 100755 new mode 100644 similarity index 100% rename from .docker/config/custom-xdebug.ini rename to Dockerfile/apache/.docker/config/custom-xdebug.ini diff --git a/.docker/config/magento.conf b/Dockerfile/apache/.docker/config/magento.conf old mode 100755 new mode 100644 similarity index 100% rename from .docker/config/magento.conf rename to Dockerfile/apache/.docker/config/magento.conf diff --git a/.docker/config/opcache.ini b/Dockerfile/apache/.docker/config/opcache.ini old mode 100755 new mode 100644 similarity index 100% rename from .docker/config/opcache.ini rename to Dockerfile/apache/.docker/config/opcache.ini diff --git a/.docker/config/php.ini b/Dockerfile/apache/.docker/config/php.ini old mode 100755 new mode 100644 similarity index 100% rename from .docker/config/php.ini rename to Dockerfile/apache/.docker/config/php.ini diff --git a/.docker/users/.bashrc b/Dockerfile/apache/.docker/users/.bashrc old mode 100755 new mode 100644 similarity index 100% rename from .docker/users/.bashrc rename to Dockerfile/apache/.docker/users/.bashrc diff --git a/.docker/users/env.sample.php b/Dockerfile/apache/.docker/users/env.sample.php old mode 100755 new mode 100644 similarity index 100% rename from .docker/users/env.sample.php rename to Dockerfile/apache/.docker/users/env.sample.php diff --git a/Dockerfile b/Dockerfile/apache/Dockerfile old mode 100755 new mode 100644 similarity index 96% rename from Dockerfile rename to Dockerfile/apache/Dockerfile index 21425761e4e..5dfd4787ea4 --- a/Dockerfile +++ b/Dockerfile/apache/Dockerfile @@ -22,7 +22,7 @@ RUN apt-get update \ apt-utils \ gnupg \ redis-tools \ - mysql-client \ + mariadb-client \ git \ vim \ wget \ @@ -33,6 +33,7 @@ RUN apt-get update \ tar \ cron \ bash-completion \ + libsodium-dev \ && apt-get clean # Install Magento Dependencies @@ -49,7 +50,8 @@ RUN docker-php-ext-configure \ pdo_mysql \ soap \ xsl \ - zip + zip \ + sockets # Install oAuth @@ -63,7 +65,7 @@ RUN apt-get update \ # Install Node, NVM, NPM and Grunt -RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \ +RUN curl -sL https://deb.nodesource.com/setup_11.x | bash - \ && apt-get install -y nodejs build-essential \ && curl https://raw.githubusercontent.com/creationix/nvm/v0.16.1/install.sh | sh \ && npm i -g grunt-cli yarn diff --git a/chikatana b/chikatana new file mode 100644 index 00000000000..7b7f0b73428 --- /dev/null +++ b/chikatana @@ -0,0 +1,107 @@ +command composer +#!/usr/bin/env bash +docker-compose exec --user www-data apache composer $@ + + + +command grint +#!/usr/bin/env bash +if [ -z "$1" ] + then + docker-compose exec --user www-data apache grunt exec + docker-compose exec --user www-data apache grunt less + docker-compose exec --user www-data apache grunt deploy + docker-compose exec --user www-data apache grunt watch +else + docker-compose exec --user www-data apache grunt exec:$@ + docker-compose exec --user www-data apache grunt less:$@ + docker-compose exec --user www-data apache grunt watch:$@ +fi + + + + +command grunt-init +#!/usr/bin/env bash +docker-compose exec --user www-data apache npm i grunt +docker-compose exec --user www-data apache npm i +./magento deploy:mode:set developer + + + + +command kill +#!/usr/bin/env bash +docker-compose stop +docker-compose down -v + + + + +command magento +#!/usr/bin/env bash +docker-compose exec --user www-data apache /var/www/html/bin/magento $@ + + + + +command n98 +#!/usr/bin/env bash +docker-compose exec --user www-data apache n98-magerun2.phar $@ + + + + +commmand opcache +#!/usr/bin/env bash + +docker-compose exec --user root apache opcache + + + + +command shell +#!/usr/bin/env bash +if [ -z "$1" ] + then + docker-compose exec --user www-data apache bash +else + docker-compose exec --user $@ apache bash +fi + + + + + +command start +#!/usr/bin/env bash +docker-compose up -d && \ +version=$(git describe --tags $(git rev-list --tags --max-count=1)) +echo " +===================== πŸš€ Done πŸš€ =================== + + Created by Rafael CorrΓͺa Gomes + v.$version + Access your new links: + + 🌎 Web server: http://localhost/ + βš™οΈ PHPMyAdmin: http://localhost:8080 + βœ‰οΈ Local emails: http://localhost:8025 + +===================== πŸš€ Done πŸš€ ===================" + + + + + +command stop +#!/usr/bin/env bash +docker-compose stop + + + + +command xdebug +#!/usr/bin/env bash + +docker-compose exec --user root apache xdebug diff --git a/composer b/composer deleted file mode 100755 index 4cae6d306e9..00000000000 --- a/composer +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -docker-compose exec --user www-data apache composer $@ diff --git a/docker-compose.elasticsearch.yml b/docker-compose.elasticsearch.yml index 68f6659a9eb..6ed47c631fe 100644 --- a/docker-compose.elasticsearch.yml +++ b/docker-compose.elasticsearch.yml @@ -11,7 +11,7 @@ services: soft: -1 hard: -1 volumes: - - ./elasticsearchdata:/usr/share/elasticsearch/data + - ./server/elasticsearch:/usr/share/elasticsearch/data ports: - 9200:9200 networks: diff --git a/env.sample.php b/env/magento/env.sample.php old mode 100755 new mode 100644 similarity index 100% rename from env.sample.php rename to env/magento/env.sample.php diff --git a/grunt b/grunt deleted file mode 100755 index 0f32255f855..00000000000 --- a/grunt +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash -if [ -z "$1" ] - then - docker-compose exec --user www-data apache grunt exec - docker-compose exec --user www-data apache grunt less - docker-compose exec --user www-data apache grunt deploy - docker-compose exec --user www-data apache grunt watch -else - docker-compose exec --user www-data apache grunt exec:$@ - docker-compose exec --user www-data apache grunt less:$@ - docker-compose exec --user www-data apache grunt watch:$@ -fi diff --git a/grunt-init b/grunt-init deleted file mode 100755 index 7ba68a24c27..00000000000 --- a/grunt-init +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -docker-compose exec --user www-data apache npm i grunt -docker-compose exec --user www-data apache npm i -./magento deploy:mode:set developer diff --git a/kill b/kill deleted file mode 100755 index ed26725fdff..00000000000 --- a/kill +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -docker-compose stop -docker-compose down -v diff --git a/magento b/magento deleted file mode 100755 index 8cab2cca701..00000000000 --- a/magento +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -docker-compose exec --user www-data apache /var/www/html/bin/magento $@ diff --git a/n98 b/n98 deleted file mode 100755 index 9254a52c60b..00000000000 --- a/n98 +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -docker-compose exec --user www-data apache n98-magerun2.phar $@ diff --git a/opcache b/opcache deleted file mode 100755 index 40d00942353..00000000000 --- a/opcache +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -docker-compose exec --user root apache opcache diff --git a/elasticsearchdata/.gitignore b/server/elasticsearch/.gitignore similarity index 100% rename from elasticsearchdata/.gitignore rename to server/elasticsearch/.gitignore diff --git a/shell b/shell deleted file mode 100755 index 82604205286..00000000000 --- a/shell +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -if [ -z "$1" ] - then - docker-compose exec --user www-data apache bash -else - docker-compose exec --user $@ apache bash -fi diff --git a/start b/start deleted file mode 100755 index 4028d114d6f..00000000000 --- a/start +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash -docker-compose up -d && \ -version=$(git describe --tags $(git rev-list --tags --max-count=1)) -echo " -===================== πŸš€ Done πŸš€ =================== - - Created by Rafael CorrΓͺa Gomes - v.$version - Access your new links: - - 🌎 Web server: http://localhost/ - βš™οΈ PHPMyAdmin: http://localhost:8080 - βœ‰οΈ Local emails: http://localhost:8025 - -===================== πŸš€ Done πŸš€ ===================" diff --git a/stop b/stop deleted file mode 100755 index 01b38aed708..00000000000 --- a/stop +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -docker-compose stop diff --git a/xdebug b/xdebug deleted file mode 100755 index 383716b81af..00000000000 --- a/xdebug +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -docker-compose exec --user root apache xdebug From 8c39bb1ee25e93ea996e9601cd0fe875665803a0 Mon Sep 17 00:00:00 2001 From: Palomino Date: Fri, 24 Jan 2020 10:50:47 -0600 Subject: [PATCH 02/13] Se agrego el commando de chikatana --- chikatana | 214 +++++++++++++++++++++++++++--------------------------- 1 file changed, 107 insertions(+), 107 deletions(-) diff --git a/chikatana b/chikatana index 7b7f0b73428..9a9e024b132 100644 --- a/chikatana +++ b/chikatana @@ -1,107 +1,107 @@ -command composer -#!/usr/bin/env bash -docker-compose exec --user www-data apache composer $@ - - - -command grint -#!/usr/bin/env bash -if [ -z "$1" ] - then - docker-compose exec --user www-data apache grunt exec - docker-compose exec --user www-data apache grunt less - docker-compose exec --user www-data apache grunt deploy - docker-compose exec --user www-data apache grunt watch -else - docker-compose exec --user www-data apache grunt exec:$@ - docker-compose exec --user www-data apache grunt less:$@ - docker-compose exec --user www-data apache grunt watch:$@ -fi - - - - -command grunt-init -#!/usr/bin/env bash -docker-compose exec --user www-data apache npm i grunt -docker-compose exec --user www-data apache npm i -./magento deploy:mode:set developer - - - - -command kill -#!/usr/bin/env bash -docker-compose stop -docker-compose down -v - - - - -command magento -#!/usr/bin/env bash -docker-compose exec --user www-data apache /var/www/html/bin/magento $@ - - - - -command n98 -#!/usr/bin/env bash -docker-compose exec --user www-data apache n98-magerun2.phar $@ - - - - -commmand opcache -#!/usr/bin/env bash - -docker-compose exec --user root apache opcache - - - - -command shell -#!/usr/bin/env bash -if [ -z "$1" ] - then - docker-compose exec --user www-data apache bash -else - docker-compose exec --user $@ apache bash -fi - - - - - -command start -#!/usr/bin/env bash -docker-compose up -d && \ -version=$(git describe --tags $(git rev-list --tags --max-count=1)) -echo " -===================== πŸš€ Done πŸš€ =================== - - Created by Rafael CorrΓͺa Gomes - v.$version - Access your new links: - - 🌎 Web server: http://localhost/ - βš™οΈ PHPMyAdmin: http://localhost:8080 - βœ‰οΈ Local emails: http://localhost:8025 - -===================== πŸš€ Done πŸš€ ===================" - - - - - -command stop -#!/usr/bin/env bash -docker-compose stop - - - - -command xdebug -#!/usr/bin/env bash - -docker-compose exec --user root apache xdebug +#!/usr/bin/python +import sys +import os + +if sys.argv[0] != "./chikatana": + print("Comando no valido.") + exit(0) + +def printHelp(): + print("Chikatana Command Line:") + +if len(sys.argv) == 1: + printHelp() + exit(0) + +if sys.argv[1] == "init": + os.system("docker-compose up -d") + exit(0) + +if sys.argv[1] == "up": + os.system("docker-compose up -d") + exit(0) + +if sys.argv[1] == "down": + os.system("docker-compose down") + exit(0) + +if sys.argv[1] == "restart": + os.system("docker-compose down && docker-compose up -d") + exit(0) + + + +################################################################################### +# # +# DOCKER COMMANDS # +# # +################################################################################### + +if sys.argv[1] == "docker": + if len(sys.argv) == 3: + if sys.argv[2] == "ps": + os.system("docker-compose ps") + exit(0) + + # Mensaje para indicar que el comando no fue encontrado + print("El comando docker no encontrado") + elif len(sys.argv) > 3: + if sys.argv[2] == "magento": + if sys.argv[3] == "build": + os.system("cd DockerFile && docker build --rm --no-cache -t rafaelcgstz/magento2 .") + exit(0) + + # Mensaje para indicar que el comando no fue encontrado + print("El comando docker no encontrado") + else: + # Mensaje para indicar que el comando no se puede ejecutar + print("El comando docker esta incompleto") + exit(0) + + + + +################################################################################### +# # +# MAGENTO COMMANDS # +# # +################################################################################### + +if sys.argv[1] == "magento": + if len(sys.argv) == 2: + os.system("docker exec -it bizarro_apache_1 bash") + exit(0) + elif len(sys.argv) >= 3: + if sys.argv[2] == "composer": + os.system("docker exec -it bizarro_apache_1 composer install") + exit(0) + elif sys.argv[2] == "upgrade": + os.system("docker exec -it bizarro_apache_1 php bin/magento setup:upgrade") + exit(0) + elif sys.argv[2] == "cache": + print("Borrando Cahe ...") + os.system("docker exec -it bizarro_apache_1 php bin/magento cache:clean") + print("Cambiando permisos ...") + os.system("docker exec -it bizarro_apache_1 chown -R www-data:www-data generated pub var") + print("Hecho.") + exit(0) + elif sys.argv[2] == "template-hints": + if sys.argv[3] == "enable": + os.system("docker exec -it bizarro_apache_1 php bin/magento dev:template-hints:enable") + exit(0) + else: + os.system("docker exec -it bizarro_apache_1 php bin/magento dev:template-hints:disable") + exit(0) + + + # Mensaje para indicar que el comando no fue encontrado + print("El comando docker no encontrado") + elif len(sys.argv) > 3: + # if sys.argv[2] == "build": + + # Mensaje para indicar que el comando no fue encontrado + print("El comando docker no encontrado") + else: + # Mensaje para indicar que el comando no se puede ejecutar + print("El comando de magento esta incompleto") + exit(0) \ No newline at end of file From eedda8b7eaab857e21fdcae1e3f98316bb15808f Mon Sep 17 00:00:00 2001 From: Palomino Date: Thu, 6 Feb 2020 15:38:43 -0600 Subject: [PATCH 03/13] Modificaciones para que ya no este en localhost por problemas con las cookies --- .gitignore | 3 ++ chikatana | 79 +++++++++++++++++++++++++----- docker-compose.yml | 32 +++++++++--- env/magento/magento-vars.php | 14 ++++++ env/magento/php.ini | 10 ++++ server/proxy/vhost/ananda.ckt.conf | 25 ++++++++++ server/proxy/vhost/default.conf | 44 +++++++++++++++++ 7 files changed, 188 insertions(+), 19 deletions(-) create mode 100644 env/magento/magento-vars.php create mode 100644 env/magento/php.ini create mode 100644 server/proxy/vhost/ananda.ckt.conf create mode 100644 server/proxy/vhost/default.conf diff --git a/.gitignore b/.gitignore index a968c372148..ee1ed17aefe 100755 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ /src/* .DS_Store /.idea +src +db +server/proxy/logs/ diff --git a/chikatana b/chikatana index 9a9e024b132..6adbcf44231 100644 --- a/chikatana +++ b/chikatana @@ -1,6 +1,8 @@ #!/usr/bin/python import sys import os +import colorama +from colorama import Fore, Style if sys.argv[0] != "./chikatana": print("Comando no valido.") @@ -69,31 +71,86 @@ if sys.argv[1] == "docker": if sys.argv[1] == "magento": if len(sys.argv) == 2: - os.system("docker exec -it bizarro_apache_1 bash") + os.system("docker-compose exec -u www-data apache bash") exit(0) elif len(sys.argv) >= 3: if sys.argv[2] == "composer": - os.system("docker exec -it bizarro_apache_1 composer install") + os.system("docker-compose exec -u www-data apache composer install") exit(0) elif sys.argv[2] == "upgrade": - os.system("docker exec -it bizarro_apache_1 php bin/magento setup:upgrade") + os.system("docker-compose exec -u www-data apache php bin/magento setup:upgrade") exit(0) + + + + ########################################################################### + # CACHE COMMANDS # + ########################################################################### + elif sys.argv[2] == "cache": - print("Borrando Cahe ...") - os.system("docker exec -it bizarro_apache_1 php bin/magento cache:clean") - print("Cambiando permisos ...") - os.system("docker exec -it bizarro_apache_1 chown -R www-data:www-data generated pub var") - print("Hecho.") - exit(0) + if sys.argv[3] == "status": + os.system("docker-compose exec -u www-data apache php bin/magento cache:status") + exit(0) + elif sys.argv[3] == "enable": + print(Fore.BLUE + "Enable Cahe ..." + Style.RESET_ALL) + os.system("docker-compose exec -u www-data apache php bin/magento cache:enable") + print(Fore.BLUE + "Disable Cahe Modules ..." + Style.RESET_ALL) + os.system("docker-compose exec -u www-data apache php bin/magento cache:disable collections eav full_page layout") + print(Fore.GREEN + "Hecho." + Style.RESET_ALL) + exit(0) + elif sys.argv[3] == "disable": + print(Fore.BLUE + "Disable Cahe ..." + Style.RESET_ALL) + os.system("docker-compose exec -u www-data apache php bin/magento cache:disable") + print(Fore.GREEN + "Hecho." + Style.RESET_ALL) + exit(0) + elif sys.argv[3] == "clear": + print(Fore.BLUE + "Borrando Cahe ..." + Style.RESET_ALL) + os.system("docker-compose exec -u www-data apache php bin/magento cache:clean") + # print(Fore.BLUE + "Cambiando permisos ..." + Style.RESET_ALL) + # os.system("docker-compose exec -u www-data apache chown -R www-data:www-data generated pub var") + print(Fore.GREEN + "Hecho." + Style.RESET_ALL) + exit(0) + else: + print("El comando de magento esta incompleto") + + + + ########################################################################### + # TEMPLATE HINTS COMMANDS # + ########################################################################### + elif sys.argv[2] == "template-hints": if sys.argv[3] == "enable": - os.system("docker exec -it bizarro_apache_1 php bin/magento dev:template-hints:enable") + os.system("docker-compose exec -u www-data apache php bin/magento dev:template-hints:enable") exit(0) else: - os.system("docker exec -it bizarro_apache_1 php bin/magento dev:template-hints:disable") + os.system("docker-compose exec -u www-data apache php bin/magento dev:template-hints:disable") exit(0) + + ########################################################################### + # STYLES COMMANDS # + ########################################################################### + + elif sys.argv[2] == "styles": + print(Fore.BLUE + "Compilando Estilos ..." + Style.RESET_ALL) + os.system("docker-compose exec -u www-data apache grunt clean exec:biz less:biz;") + print(Fore.BLUE + "Borrando Cahe ..." + Style.RESET_ALL) + os.system("docker-compose exec -u www-data apache php bin/magento cache:clean") + print(Fore.GREEN + "Hecho." + Style.RESET_ALL) + exit(0) + + + elif sys.argv[2] == "create": + if sys.argv[3] == "admin-user": + print(Fore.BLUE + "Creando Palomino admin ..." + Style.RESET_ALL) + os.system("docker-compose exec -u www-data apache php bin/magento admin:user:create --admin-user='palominoAdmin' --admin-password='Law200110513' --admin-email='palomino@wolfsellers.com' --admin-firstname='palomino' --admin-lastname='palomino'") + else: + print("No se encontro el commando a ejecutar.") + exit(0) + + # Mensaje para indicar que el comando no fue encontrado print("El comando docker no encontrado") elif len(sys.argv) > 3: diff --git a/docker-compose.yml b/docker-compose.yml index 8bcea16a724..cb43842cdd1 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,13 +4,16 @@ services: image: rafaelcgstz/magento2 # build: . ports: - - "80:80" # web + - "8081:80" # web - "9001:9000" # xdebug # - "35729:35729" # live reload volumes: - ./src:/var/www/html - ~/.composer:/var/www/.composer - ~/.npm:/var/www/.npm + - ~/.ssh:/root/.ssh + - ./env/magento/magento-vars.php:/app/magento-vars.php + - ./env/magento/php.ini:/usr/local/etc/php/php.ini # - ~/.nvm:/var/www/.nvm environment: XDEBUG_CONFIG: "remote_host=localhost" @@ -20,7 +23,7 @@ services: links: - db networks: - - -network + - ananda-network db: image: mariadb @@ -34,7 +37,7 @@ services: volumes: - dbdata:/var/lib/mysql networks: - - -network + - ananda-network phpmyadmin: image: phpmyadmin/phpmyadmin @@ -46,21 +49,21 @@ services: ports: - 8080:80 networks: - - -network + - ananda-network redis: image: redis ports: - 6379 networks: - - -network + - ananda-network redis-session: image: redis ports: - 6379 networks: - - -network + - ananda-network mailhog: image: mailhog/mailhog @@ -68,10 +71,23 @@ services: - 1025:1025 - 8025:8025 networks: - - -network + - ananda-network + + proxy: + image: nginx:1.15 + ports: + - "80:80" + volumes: + - ./server/proxy/vhost:/etc/nginx/conf.d + - ./server/proxy/logs:/etc/nginx/logs + links: + - apache + networks: + - ananda-network + restart: always networks: - -network: + ananda-network: driver: bridge volumes: diff --git a/env/magento/magento-vars.php b/env/magento/magento-vars.php new file mode 100644 index 00000000000..803950e2645 --- /dev/null +++ b/env/magento/magento-vars.php @@ -0,0 +1,14 @@ + Date: Fri, 7 Feb 2020 14:52:40 -0600 Subject: [PATCH 04/13] Correcion del commando para crear el admin user --- chikatana | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 chikatana diff --git a/chikatana b/chikatana old mode 100644 new mode 100755 index 6adbcf44231..9357c1d3f97 --- a/chikatana +++ b/chikatana @@ -145,7 +145,7 @@ if sys.argv[1] == "magento": elif sys.argv[2] == "create": if sys.argv[3] == "admin-user": print(Fore.BLUE + "Creando Palomino admin ..." + Style.RESET_ALL) - os.system("docker-compose exec -u www-data apache php bin/magento admin:user:create --admin-user='palominoAdmin' --admin-password='Law200110513' --admin-email='palomino@wolfsellers.com' --admin-firstname='palomino' --admin-lastname='palomino'") + os.system("docker-compose exec -u www-data apache php bin/magento admin:user:create --admin-user='palomino' --admin-password='Law200110513' --admin-email='palomino@wolfsellers.com' --admin-firstname='palomino' --admin-lastname='palomino'") else: print("No se encontro el commando a ejecutar.") exit(0) @@ -161,4 +161,4 @@ if sys.argv[1] == "magento": else: # Mensaje para indicar que el comando no se puede ejecutar print("El comando de magento esta incompleto") - exit(0) \ No newline at end of file + exit(0) From 816e37b13f8bb01dada42011d6526ca30ebae646 Mon Sep 17 00:00:00 2001 From: Palomino Date: Sat, 8 Feb 2020 19:07:41 -0600 Subject: [PATCH 05/13] cambios en el network --- .gitignore | 1 + docker-compose.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index ee1ed17aefe..06308dee6c9 100755 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ src db server/proxy/logs/ +src/index.php diff --git a/docker-compose.yml b/docker-compose.yml index cb43842cdd1..b2ce641107c 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,7 +23,7 @@ services: links: - db networks: - - ananda-network + - magento-network db: image: mariadb @@ -37,7 +37,7 @@ services: volumes: - dbdata:/var/lib/mysql networks: - - ananda-network + - magento-network phpmyadmin: image: phpmyadmin/phpmyadmin @@ -49,21 +49,21 @@ services: ports: - 8080:80 networks: - - ananda-network + - magento-network redis: image: redis ports: - 6379 networks: - - ananda-network + - magento-network redis-session: image: redis ports: - 6379 networks: - - ananda-network + - magento-network mailhog: image: mailhog/mailhog @@ -71,7 +71,7 @@ services: - 1025:1025 - 8025:8025 networks: - - ananda-network + - magento-network proxy: image: nginx:1.15 @@ -83,11 +83,11 @@ services: links: - apache networks: - - ananda-network + - magento-network restart: always networks: - ananda-network: + magento-network: driver: bridge volumes: From 0d0ec0816f7298bec815210ed9616ca45c467f61 Mon Sep 17 00:00:00 2001 From: Palomino Date: Tue, 11 Feb 2020 12:46:29 -0600 Subject: [PATCH 06/13] Cambio en los comandos de chikatana para mas comididad en template-hints y cache --- chikatana | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/chikatana b/chikatana index 6adbcf44231..b6f64d4bc18 100644 --- a/chikatana +++ b/chikatana @@ -88,7 +88,12 @@ if sys.argv[1] == "magento": ########################################################################### elif sys.argv[2] == "cache": - if sys.argv[3] == "status": + if len(sys.argv) == 3: + print(Fore.BLUE + "Clear Cahe ..." + Style.RESET_ALL) + os.system("docker-compose exec -u www-data apache php bin/magento cache:clean") + print(Fore.GREEN + "Hecho." + Style.RESET_ALL) + exit(0) + elif sys.argv[3] == "status": os.system("docker-compose exec -u www-data apache php bin/magento cache:status") exit(0) elif sys.argv[3] == "enable": @@ -104,7 +109,7 @@ if sys.argv[1] == "magento": print(Fore.GREEN + "Hecho." + Style.RESET_ALL) exit(0) elif sys.argv[3] == "clear": - print(Fore.BLUE + "Borrando Cahe ..." + Style.RESET_ALL) + print(Fore.BLUE + "Clear Cahe ..." + Style.RESET_ALL) os.system("docker-compose exec -u www-data apache php bin/magento cache:clean") # print(Fore.BLUE + "Cambiando permisos ..." + Style.RESET_ALL) # os.system("docker-compose exec -u www-data apache chown -R www-data:www-data generated pub var") @@ -120,12 +125,17 @@ if sys.argv[1] == "magento": ########################################################################### elif sys.argv[2] == "template-hints": - if sys.argv[3] == "enable": + if len(sys.argv) == 4 and sys.argv[3] == "enable": + print(Fore.BLUE + "Enable template hints ..." + Style.RESET_ALL) os.system("docker-compose exec -u www-data apache php bin/magento dev:template-hints:enable") - exit(0) else: + print(Fore.BLUE + "Disable template hints ..." + Style.RESET_ALL) os.system("docker-compose exec -u www-data apache php bin/magento dev:template-hints:disable") - exit(0) + + print(Fore.BLUE + "Clear Cahe ..." + Style.RESET_ALL) + os.system("docker-compose exec -u www-data apache php bin/magento cache:clean") + print(Fore.GREEN + "Hecho." + Style.RESET_ALL) + exit(0) @@ -143,7 +153,7 @@ if sys.argv[1] == "magento": elif sys.argv[2] == "create": - if sys.argv[3] == "admin-user": + if sys.argv[3] == "admin-user": print(Fore.BLUE + "Creando Palomino admin ..." + Style.RESET_ALL) os.system("docker-compose exec -u www-data apache php bin/magento admin:user:create --admin-user='palominoAdmin' --admin-password='Law200110513' --admin-email='palomino@wolfsellers.com' --admin-firstname='palomino' --admin-lastname='palomino'") else: From bd5397e961e911d1217876923ccf7647908271cd Mon Sep 17 00:00:00 2001 From: Palomino Date: Tue, 11 Feb 2020 13:32:50 -0600 Subject: [PATCH 07/13] Preparacion para docker hub --- chikatana | 2 +- docker-compose.yml | 166 ++++++++++++++++++++++----------------------- 2 files changed, 84 insertions(+), 84 deletions(-) diff --git a/chikatana b/chikatana index cad1f91f9cb..cb56463a76d 100755 --- a/chikatana +++ b/chikatana @@ -50,7 +50,7 @@ if sys.argv[1] == "docker": elif len(sys.argv) > 3: if sys.argv[2] == "magento": if sys.argv[3] == "build": - os.system("cd DockerFile && docker build --rm --no-cache -t rafaelcgstz/magento2 .") + os.system("cd Dockerfile/apache && docker build --rm --no-cache -t palomino/magento:apache .") exit(0) # Mensaje para indicar que el comando no fue encontrado diff --git a/docker-compose.yml b/docker-compose.yml index b2ce641107c..3d9814fd161 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,95 +1,95 @@ version: '2' services: - apache: - image: rafaelcgstz/magento2 - # build: . - ports: - - "8081:80" # web - - "9001:9000" # xdebug - # - "35729:35729" # live reload - volumes: - - ./src:/var/www/html - - ~/.composer:/var/www/.composer - - ~/.npm:/var/www/.npm - - ~/.ssh:/root/.ssh - - ./env/magento/magento-vars.php:/app/magento-vars.php - - ./env/magento/php.ini:/usr/local/etc/php/php.ini - # - ~/.nvm:/var/www/.nvm - environment: - XDEBUG_CONFIG: "remote_host=localhost" - PHP_IDE_CONFIG: "serverName=Docker" - depends_on: - - db - links: - - db - networks: - - magento-network + apache: + image: palomino/magento:apache + # build: . + ports: + - "8081:80" # web + - "9001:9000" # xdebug + # - "35729:35729" # live reload + volumes: + - ./src:/var/www/html + - ~/.composer:/var/www/.composer + - ~/.npm:/var/www/.npm + - ~/.ssh:/root/.ssh + - ./env/magento/magento-vars.php:/app/magento-vars.php + - ./env/magento/php.ini:/usr/local/etc/php/php.ini + # - ~/.nvm:/var/www/.nvm + environment: + XDEBUG_CONFIG: "remote_host=ananda.ckt" + PHP_IDE_CONFIG: "serverName=Docker" + depends_on: + - db + links: + - db + networks: + - magento-network - db: - image: mariadb - ports: - - 3300:3306 - environment: - - MYSQL_ROOT_PASSWORD=root - - MYSQL_DATABASE=magento - - MYSQL_USER=magento - - MYSQL_PASSWORD=magento - volumes: - - dbdata:/var/lib/mysql - networks: - - magento-network + db: + image: mariadb + ports: + - 3300:3306 + environment: + - MYSQL_ROOT_PASSWORD=root + - MYSQL_DATABASE=magento + - MYSQL_USER=magento + - MYSQL_PASSWORD=magento + volumes: + - dbdata:/var/lib/mysql + networks: + - magento-network - phpmyadmin: - image: phpmyadmin/phpmyadmin - environment: - - PMA_HOST=db - - PMA_USER=root - - PMA_PASSWORD=root - - MYSQL_ROOT_PASSWORD=root - ports: - - 8080:80 - networks: - - magento-network + phpmyadmin: + image: phpmyadmin/phpmyadmin + environment: + - PMA_HOST=db + - PMA_USER=root + - PMA_PASSWORD=root + - MYSQL_ROOT_PASSWORD=root + ports: + - 8080:80 + networks: + - magento-network - redis: - image: redis - ports: - - 6379 - networks: - - magento-network + redis: + image: redis + ports: + - 6379 + networks: + - magento-network - redis-session: - image: redis - ports: - - 6379 - networks: - - magento-network + redis-session: + image: redis + ports: + - 6379 + networks: + - magento-network - mailhog: - image: mailhog/mailhog - ports: - - 1025:1025 - - 8025:8025 - networks: - - magento-network + mailhog: + image: mailhog/mailhog + ports: + - 1025:1025 + - 8025:8025 + networks: + - magento-network - proxy: - image: nginx:1.15 - ports: - - "80:80" - volumes: - - ./server/proxy/vhost:/etc/nginx/conf.d - - ./server/proxy/logs:/etc/nginx/logs - links: - - apache - networks: - - magento-network - restart: always + proxy: + image: nginx:1.15 + ports: + - "80:80" + volumes: + - ./server/proxy/vhost:/etc/nginx/conf.d + - ./server/proxy/logs:/etc/nginx/logs + links: + - apache + networks: + - magento-network + restart: always networks: - magento-network: - driver: bridge + magento-network: + driver: bridge volumes: - dbdata: - driver: local + dbdata: + driver: local From 090a1ac1b175b1c8899f345d4eceaa4b779e492f Mon Sep 17 00:00:00 2001 From: Palomino Date: Tue, 11 Feb 2020 15:52:18 -0600 Subject: [PATCH 08/13] git status --- Dockerfile/apache/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile/apache/Dockerfile b/Dockerfile/apache/Dockerfile index 5dfd4787ea4..96a7de10f6a 100644 --- a/Dockerfile/apache/Dockerfile +++ b/Dockerfile/apache/Dockerfile @@ -103,11 +103,11 @@ RUN wget https://files.magerun.net/n98-magerun2.phar \ # Configuring system -ADD .docker/config/php.ini /usr/local/etc/php/php.ini -ADD .docker/config/magento.conf /etc/apache2/sites-available/magento.conf -ADD .docker/config/custom-xdebug.ini /usr/local/etc/php/conf.d/custom-xdebug.ini -COPY .docker/bin/* /usr/local/bin/ -COPY .docker/users/* /var/www/ +ADD Dockerfile/apache/.docker/config/php.ini /usr/local/etc/php/php.ini +ADD Dockerfile/apache/.docker/config/magento.conf /etc/apache2/sites-available/magento.conf +ADD Dockerfile/apache/.docker/config/custom-xdebug.ini /usr/local/etc/php/conf.d/custom-xdebug.ini +COPY Dockerfile/apache/.docker/bin/* /usr/local/bin/ +COPY Dockerfile/apache/.docker/users/* /var/www/ RUN chmod +x /usr/local/bin/* RUN ln -s /etc/apache2/sites-available/magento.conf /etc/apache2/sites-enabled/magento.conf From cc77717669f311c980909df475c8a8baeb891dbd Mon Sep 17 00:00:00 2001 From: Palomino Date: Tue, 11 Feb 2020 15:59:53 -0600 Subject: [PATCH 09/13] git status --- Dockerfile/apache/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile/apache/Dockerfile b/Dockerfile/apache/Dockerfile index 96a7de10f6a..5dfd4787ea4 100644 --- a/Dockerfile/apache/Dockerfile +++ b/Dockerfile/apache/Dockerfile @@ -103,11 +103,11 @@ RUN wget https://files.magerun.net/n98-magerun2.phar \ # Configuring system -ADD Dockerfile/apache/.docker/config/php.ini /usr/local/etc/php/php.ini -ADD Dockerfile/apache/.docker/config/magento.conf /etc/apache2/sites-available/magento.conf -ADD Dockerfile/apache/.docker/config/custom-xdebug.ini /usr/local/etc/php/conf.d/custom-xdebug.ini -COPY Dockerfile/apache/.docker/bin/* /usr/local/bin/ -COPY Dockerfile/apache/.docker/users/* /var/www/ +ADD .docker/config/php.ini /usr/local/etc/php/php.ini +ADD .docker/config/magento.conf /etc/apache2/sites-available/magento.conf +ADD .docker/config/custom-xdebug.ini /usr/local/etc/php/conf.d/custom-xdebug.ini +COPY .docker/bin/* /usr/local/bin/ +COPY .docker/users/* /var/www/ RUN chmod +x /usr/local/bin/* RUN ln -s /etc/apache2/sites-available/magento.conf /etc/apache2/sites-enabled/magento.conf From e59645d0aed9a2081e4e055dfee4d8dfff33d797 Mon Sep 17 00:00:00 2001 From: Palomino Date: Wed, 12 Feb 2020 12:42:28 -0600 Subject: [PATCH 10/13] Se agrego el commando de contenido estatico a chikatana --- chikatana | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/chikatana b/chikatana index cb56463a76d..8bcd860153c 100755 --- a/chikatana +++ b/chikatana @@ -152,6 +152,22 @@ if sys.argv[1] == "magento": exit(0) + + ########################################################################### + # STYLES COMMANDS # + ########################################################################### + + elif sys.argv[2] == "static-content": + print(Fore.BLUE + "Deploy static content ..." + Style.RESET_ALL) + os.system("docker-compose exec -u www-data apache php bin/magento setup:static-content:deploy es_MX -f") + print(Fore.GREEN + "Hecho." + Style.RESET_ALL) + exit(0) + + + ########################################################################### + # OTHERS COMMANDS # + ########################################################################### + elif sys.argv[2] == "create": if sys.argv[3] == "admin-user": print(Fore.BLUE + "Creando Palomino admin ..." + Style.RESET_ALL) From ca319637a22f3ab4491e92b14c9cb799c7c5cccc Mon Sep 17 00:00:00 2001 From: Palomino Date: Thu, 13 Feb 2020 12:18:13 -0600 Subject: [PATCH 11/13] Cambio de la version de php --- Dockerfile/apache/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile/apache/Dockerfile b/Dockerfile/apache/Dockerfile index 5dfd4787ea4..054e96418b9 100644 --- a/Dockerfile/apache/Dockerfile +++ b/Dockerfile/apache/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.1-apache +FROM php:7.2-apache MAINTAINER Rafael CorrΓͺa Gomes @@ -46,7 +46,7 @@ RUN docker-php-ext-configure \ bcmath \ intl \ mbstring \ - mcrypt \ + # mcrypt \ pdo_mysql \ soap \ xsl \ From b14c3a5db946e948179557a6ce5a21e03ea1c999 Mon Sep 17 00:00:00 2001 From: Palomino Date: Wed, 17 Jun 2020 18:05:55 -0500 Subject: [PATCH 12/13] modificacion para pwa --- .gitignore | 1 + Dockerfile/pwa/.docker/bin/fix-permission | 18 +++ Dockerfile/pwa/.docker/bin/install-magento2 | 47 +++++++ Dockerfile/pwa/.docker/bin/opcache | 11 ++ Dockerfile/pwa/.docker/bin/redis-flush | 3 + Dockerfile/pwa/.docker/bin/xdebug | 11 ++ .../pwa/.docker/config/custom-xdebug.ini | 11 ++ Dockerfile/pwa/.docker/config/magento.conf | 14 ++ Dockerfile/pwa/.docker/config/opcache.ini | 10 ++ Dockerfile/pwa/.docker/config/php.ini | 9 ++ Dockerfile/pwa/.docker/users/.bashrc | 12 ++ Dockerfile/pwa/.docker/users/env.sample.php | 125 +++++++++++++++++ Dockerfile/pwa/Dockerfile | 127 ++++++++++++++++++ docker-compose.yml | 21 +++ 14 files changed, 420 insertions(+) create mode 100644 Dockerfile/pwa/.docker/bin/fix-permission create mode 100644 Dockerfile/pwa/.docker/bin/install-magento2 create mode 100644 Dockerfile/pwa/.docker/bin/opcache create mode 100644 Dockerfile/pwa/.docker/bin/redis-flush create mode 100644 Dockerfile/pwa/.docker/bin/xdebug create mode 100644 Dockerfile/pwa/.docker/config/custom-xdebug.ini create mode 100644 Dockerfile/pwa/.docker/config/magento.conf create mode 100644 Dockerfile/pwa/.docker/config/opcache.ini create mode 100644 Dockerfile/pwa/.docker/config/php.ini create mode 100644 Dockerfile/pwa/.docker/users/.bashrc create mode 100644 Dockerfile/pwa/.docker/users/env.sample.php create mode 100644 Dockerfile/pwa/Dockerfile diff --git a/.gitignore b/.gitignore index 06308dee6c9..2a6a4f31886 100755 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ src db server/proxy/logs/ src/index.php +server/proxy/ssl/ diff --git a/Dockerfile/pwa/.docker/bin/fix-permission b/Dockerfile/pwa/.docker/bin/fix-permission new file mode 100644 index 00000000000..6b0e7041813 --- /dev/null +++ b/Dockerfile/pwa/.docker/bin/fix-permission @@ -0,0 +1,18 @@ +#!/usr/bin/env bash +chmod -R 777 /var/www/ +# find /var/www/html/ -type f -exec chmod 644 {} \; # 644 permission for files +# find /var/www/html/ -type d -exec chmod 755 {} \; # 755 permission for directory +# if [ -d /var/www/html/var/ ]; then +# find /var/www/html/var/ -type d -exec chmod 777 {} \; # 777 permission for var folder +# fi +# if [ -d /var/www/html/pub/ ]; then +# find /var/www/html/pub/ -type d -exec chmod 777 {} \; +# fi +# if [ -d /var/www/html/app/etc ]; then +# chmod 777 /var/www/html/app/etc +# chmod 644 /var/www/html/app/etc/*.xml +# fi +# chown -R :www-data /var/www/html/ +if [ -e "/var/www/html/bin/magento" ]; then + chmod u+x /var/www/html/bin/magento +fi diff --git a/Dockerfile/pwa/.docker/bin/install-magento2 b/Dockerfile/pwa/.docker/bin/install-magento2 new file mode 100644 index 00000000000..44d71e505ea --- /dev/null +++ b/Dockerfile/pwa/.docker/bin/install-magento2 @@ -0,0 +1,47 @@ +#!/usr/bin/env bash +if [ $@ ]; then + composer create-project --repository-url=https://repo.magento.com/ magento/project-community-edition:$1 . ; +else + composer create-project --repository-url=https://repo.magento.com/ magento/project-community-edition . ; +fi +chmod u+w -R ./var ./vendor ./pub/static ./pub/media ./app/etc \ +&& chmod u+x ./bin/magento \ +&& php -f ./bin/magento setup:install --base-url=http://localhost/ \ + --db-host=db \ + --db-name=magento \ + --db-user=magento \ + --db-password=magento \ + --admin-firstname=Magento \ + --admin-lastname=Commerce \ + --admin-email=user@example.com \ + --admin-user=admin \ + --admin-password=admin123 \ + --language=en_US \ + --currency=USD \ + --timezone=America/Chicago \ + --use-rewrites=1 \ + --backend-frontname=admin \ + --use-sample-data \ +&& mv ./app/etc/env.php ./app/etc/env.original.php; +cp -rv /var/www/env.sample.php ./app/etc/env.php; +n98 cron:install; +php -f ./bin/magento indexer:set-mode schedule; +cp ~/.composer/auth.json var/composer_home/auth.json \ +&& php -f ./bin/magento sampledata:deploy \ +&& php -f ./bin/magento setup:upgrade \ +&& php -f ./bin/magento indexer:reindex \ +&& php -f ./bin/magento cache:flush; +mv package.json.sample package.json ; mv Gruntfile.js.sample Gruntfile.js; +npm i; +php -f ./bin/magento deploy:mode:set production \ +&& composer dump-autoload -o \ +&& clear && echo " +===================== πŸš€ Done πŸš€ =================== + + Magento 2 Installed successfully! + + 🌎 Admin: http://localhost/admin + πŸ‘€ User: admin + πŸ”‘ Password: admin123 + +===================== πŸš€ Done πŸš€ ===================" diff --git a/Dockerfile/pwa/.docker/bin/opcache b/Dockerfile/pwa/.docker/bin/opcache new file mode 100644 index 00000000000..c044f6684b1 --- /dev/null +++ b/Dockerfile/pwa/.docker/bin/opcache @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +if [ -s "/usr/local/etc/php/conf.d/docker-php-ext-opcache.ini" ]; then + mv /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini /usr/local/etc/php/conf.d/docker-php-ext-opcache.iniOLD \ + && /etc/init.d/apache2 force-reload \ + && echo '========= OPCache was disabled =========' +else + mv /usr/local/etc/php/conf.d/docker-php-ext-opcache.iniOLD /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini \ + && /etc/init.d/apache2 force-reload \ + && echo '========= OPCache was enabled =========' +fi diff --git a/Dockerfile/pwa/.docker/bin/redis-flush b/Dockerfile/pwa/.docker/bin/redis-flush new file mode 100644 index 00000000000..21bb16cab32 --- /dev/null +++ b/Dockerfile/pwa/.docker/bin/redis-flush @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +redis-cli -h redis-session flushall +redis-cli -h redis flushall diff --git a/Dockerfile/pwa/.docker/bin/xdebug b/Dockerfile/pwa/.docker/bin/xdebug new file mode 100644 index 00000000000..e3ba5708280 --- /dev/null +++ b/Dockerfile/pwa/.docker/bin/xdebug @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +if [ -s "/usr/local/etc/php/conf.d/xdebug.ini" ]; then + mv /usr/local/etc/php/conf.d/xdebug.ini /usr/local/etc/php/conf.d/xdebug.iniOLD \ + && /etc/init.d/apache2 force-reload \ + && echo '========= XDebug was disabled =========' +else + mv /usr/local/etc/php/conf.d/xdebug.iniOLD /usr/local/etc/php/conf.d/xdebug.ini \ + && /etc/init.d/apache2 force-reload \ + && echo '========= XDebug was enabled =========' +fi diff --git a/Dockerfile/pwa/.docker/config/custom-xdebug.ini b/Dockerfile/pwa/.docker/config/custom-xdebug.ini new file mode 100644 index 00000000000..4b18dacdb94 --- /dev/null +++ b/Dockerfile/pwa/.docker/config/custom-xdebug.ini @@ -0,0 +1,11 @@ +xdebug.idekey="PHPSTORM" +xdebug.default_enable=1 +xdebug.remote_port=9000 +xdebug.remote_autostart=1 +xdebug.remote_enable=1 +xdebug.remote_handler=dbgp +xdebug.profiler_enable=0 +xdebug.profiler_output_dir="/var/www/html" +xdebug.remote_connect_back=1 +xdebug.cli_color=1 +xdebug.var_display_max_depth=10 diff --git a/Dockerfile/pwa/.docker/config/magento.conf b/Dockerfile/pwa/.docker/config/magento.conf new file mode 100644 index 00000000000..d661d4194ce --- /dev/null +++ b/Dockerfile/pwa/.docker/config/magento.conf @@ -0,0 +1,14 @@ + + ServerAdmin admin@yourdomain.com + DocumentRoot /var/www/html/ +# ServerName dev.local +# ServerAlias www.dev.local + + Options FollowSymLinks + AllowOverride All + Order allow,deny + allow from all + + ErrorLog /var/log/apache2/magento2-error_log + CustomLog /var/log/apache2/magento2-access_log common + diff --git a/Dockerfile/pwa/.docker/config/opcache.ini b/Dockerfile/pwa/.docker/config/opcache.ini new file mode 100644 index 00000000000..0fd46984224 --- /dev/null +++ b/Dockerfile/pwa/.docker/config/opcache.ini @@ -0,0 +1,10 @@ +opcache.enable = 1 +opcache.enable_cli = 1 +opcache.memory_consumption = 512M +opcache.max_accelerated_files = 100000 +opcache.validate_timestamps=0 +opcache.consistency_checks=0 +opcache.interned_strings_buffer=8 +opcache.fast_shutdown=1 +opcache.revalidate_freq = 0 +opcache.revalidate_path = 1 diff --git a/Dockerfile/pwa/.docker/config/php.ini b/Dockerfile/pwa/.docker/config/php.ini new file mode 100644 index 00000000000..45912edd0d8 --- /dev/null +++ b/Dockerfile/pwa/.docker/config/php.ini @@ -0,0 +1,9 @@ +memory_limit = 2048M +max_execution_time = 38000 +always_populate_raw_post_data = -1 +date.timezone = "UTC" +upload_max_filesize = 128M +zlib.output_compression = on +log_errors = On +display_errors = Off +sendmail_path = "/opt/go/bin/mhsendmail --smtp-addr='mailhog:1025'" diff --git a/Dockerfile/pwa/.docker/users/.bashrc b/Dockerfile/pwa/.docker/users/.bashrc new file mode 100644 index 00000000000..23e058b07ae --- /dev/null +++ b/Dockerfile/pwa/.docker/users/.bashrc @@ -0,0 +1,12 @@ +# Alias + +alias n98='n98-magerun2.phar' +alias magerun='n98-magerun2.phar' +alias mage='php -d memory_limit=-1 -f bin/magento' +alias magento='php -d memory_limit=-1 -f bin/magento' +alias node='nodejs' + +# NVM + +export NVM_DIR="/var/www/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm diff --git a/Dockerfile/pwa/.docker/users/env.sample.php b/Dockerfile/pwa/.docker/users/env.sample.php new file mode 100644 index 00000000000..eee1069ddac --- /dev/null +++ b/Dockerfile/pwa/.docker/users/env.sample.php @@ -0,0 +1,125 @@ + + array( + 'frontName' => 'admin', + ), + 'crypt' => + array( + 'key' => '5e56dc6d8f24f711bb4f289cca1beda9', + ), + 'session' => + array( + 'save' => 'redis', + 'redis' => + array( + + 'host' => 'redis-session', + 'port' => '6379', + 'password' => '', + 'timeout' => '2.5', + 'persistent_identifier' => '', + 'database' => '2', + 'compression_threshold' => '2048', + 'compression_library' => 'gzip', + 'log_level' => '1', + 'max_concurrency' => '6', + 'break_after_frontend' => '5', + 'break_after_adminhtml' => '30', + 'first_lifetime' => '600', + 'bot_first_lifetime' => '60', + 'bot_lifetime' => '7200', + 'disable_locking' => '0', + 'min_lifetime' => '60', + 'max_lifetime' => '2592000' + ) + ), + 'db' => + array( + 'table_prefix' => '', + 'connection' => + array( + 'default' => + array( + 'host' => 'db', + 'dbname' => 'magento', + 'username' => 'magento', + 'password' => 'magento', + 'active' => '1', + ), + ), + ), + 'resource' => + array( + 'default_setup' => + array( + 'connection' => 'default', + ), + ), + 'x-frame-options' => 'SAMEORIGIN', + 'MAGE_MODE' => 'production', + 'cache_types' => + array( + 'config' => 1, + 'layout' => 1, + 'block_html' => 1, + 'collections' => 1, + 'reflection' => 1, + 'db_ddl' => 1, + 'eav' => 1, + 'customer_notification' => 1, + 'full_page' => 0, + 'config_integration' => 1, + 'config_integration_api' => 1, + 'translate' => 1, + 'config_webservice' => 1, + 'compiled_config' => 1, + ), + 'install' => + array( + 'date' => 'Thu, 05 Jan 2017 22:49:50 +0000', + ), + 'cache' => + array( + 'frontend' => + array( + 'default' => + array( + 'backend' => 'Cm_Cache_Backend_Redis', + 'backend_options' => + array( + 'server' => 'redis', + 'port' => '6379', + 'persistent' => '', + 'database' => '0', + 'password' => '', + 'force_standalone' => '0', + 'connect_retries' => '1', + 'read_timeout' => '10', + 'automatic_cleaning_factor' => '0', + 'compress_data' => '1', + 'compress_tags' => '1', + 'compress_threshold' => '20480', + 'compression_lib' => 'gzip', + 'use_lua' => '0', + ), + ), + 'page_cache' => + array( + 'backend' => 'Cm_Cache_Backend_Redis', + 'backend_options' => + array( + 'server' => 'redis', + 'port' => '6379', + 'persistent' => '', + 'database' => '1', + 'password' => '', + 'force_standalone' => '0', + 'connect_retries' => '1', + 'lifetimelimit' => '57600', + 'compress_data' => '0', + ), + ), + ), + ), +); diff --git a/Dockerfile/pwa/Dockerfile b/Dockerfile/pwa/Dockerfile new file mode 100644 index 00000000000..6fdfe5289a9 --- /dev/null +++ b/Dockerfile/pwa/Dockerfile @@ -0,0 +1,127 @@ +FROM php:7.2-apache + +MAINTAINER Rafael CorrΓͺa Gomes + +ENV XDEBUG_PORT 9000 + +# Install System Dependencies + +RUN apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + software-properties-common \ + && apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y \ + libfreetype6-dev \ + libicu-dev \ + libssl-dev \ + libjpeg62-turbo-dev \ + libmcrypt-dev \ + libedit-dev \ + libedit2 \ + libxslt1-dev \ + apt-utils \ + gnupg \ + redis-tools \ + mariadb-client \ + git \ + vim \ + wget \ + curl \ + lynx \ + psmisc \ + unzip \ + tar \ + cron \ + bash-completion \ + libsodium-dev \ + && apt-get clean + +# Install Magento Dependencies + +RUN docker-php-ext-configure \ + gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/; \ + docker-php-ext-install \ + opcache \ + gd \ + bcmath \ + intl \ + mbstring \ + # mcrypt \ + pdo_mysql \ + soap \ + xsl \ + zip \ + sockets + +# Install oAuth + +RUN apt-get update \ + && apt-get install -y \ + libpcre3 \ + libpcre3-dev \ + # php-pear \ + && pecl install oauth \ + && echo "extension=oauth.so" > /usr/local/etc/php/conf.d/docker-php-ext-oauth.ini + +# Install Node, NVM, NPM and Grunt + +RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \ + && apt-get install -y nodejs build-essential \ + && curl https://raw.githubusercontent.com/creationix/nvm/v0.16.1/install.sh | sh \ + && npm i -g grunt-cli yarn + +# Install Composer + +RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer +RUN composer global require hirak/prestissimo + +# Install Code Sniffer + +RUN git clone https://github.com/magento/marketplace-eqp.git ~/.composer/vendor/magento/marketplace-eqp +RUN cd ~/.composer/vendor/magento/marketplace-eqp && composer install +RUN ln -s ~/.composer/vendor/magento/marketplace-eqp/vendor/bin/phpcs /usr/local/bin; + +ENV PATH="/var/www/.composer/vendor/bin/:${PATH}" + +# Install XDebug + +RUN yes | pecl install xdebug && \ + echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.iniOLD + +# Install Mhsendmail + +RUN DEBIAN_FRONTEND=noninteractive apt-get -y install golang-go \ + && mkdir /opt/go \ + && export GOPATH=/opt/go \ + && go get github.com/mailhog/mhsendmail + +# Install Magerun 2 + +RUN wget https://files.magerun.net/n98-magerun2.phar \ + && chmod +x ./n98-magerun2.phar \ + && mv ./n98-magerun2.phar /usr/local/bin/ + +# Configuring system + +ADD .docker/config/php.ini /usr/local/etc/php/php.ini +ADD .docker/config/magento.conf /etc/apache2/sites-available/magento.conf +ADD .docker/config/custom-xdebug.ini /usr/local/etc/php/conf.d/custom-xdebug.ini +COPY .docker/bin/* /usr/local/bin/ +COPY .docker/users/* /var/www/ +RUN chmod +x /usr/local/bin/* +RUN ln -s /etc/apache2/sites-available/magento.conf /etc/apache2/sites-enabled/magento.conf + +RUN curl -o /etc/bash_completion.d/m2install-bash-completion https://raw.githubusercontent.com/yvoronoy/m2install/master/m2install-bash-completion +RUN curl -o /etc/bash_completion.d/n98-magerun2.phar.bash https://raw.githubusercontent.com/netz98/n98-magerun2/master/res/autocompletion/bash/n98-magerun2.phar.bash +RUN echo "source /etc/bash_completion" >> /root/.bashrc +RUN echo "source /etc/bash_completion" >> /var/www/.bashrc + +RUN chmod 777 -Rf /var/www /var/www/.* \ + && chown -Rf www-data:www-data /var/www /var/www/.* \ + && usermod -u 1000 www-data \ + && chsh -s /bin/bash www-data\ + && a2enmod rewrite \ + && a2enmod headers + +VOLUME /var/www/html +WORKDIR /var/www/html diff --git a/docker-compose.yml b/docker-compose.yml index 3d9814fd161..600b4c5da91 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,30 @@ version: '2' services: + pwa: + image: palomino/magento:pwa + ports: + - "8082:80" # web + volumes: + - ./pwa:/var/www/html + - ~/.composer:/var/www/.composer + - ~/.npm:/var/www/.npm + - ~/.ssh:/root/.ssh + environment: + XDEBUG_CONFIG: "remote_host=ananda.ckt" + PHP_IDE_CONFIG: "serverName=Docker" + depends_on: + - db + links: + - db + networks: + - magento-network + apache: image: palomino/magento:apache # build: . ports: - "8081:80" # web + - "443:443" - "9001:9000" # xdebug # - "35729:35729" # live reload volumes: @@ -12,6 +32,7 @@ services: - ~/.composer:/var/www/.composer - ~/.npm:/var/www/.npm - ~/.ssh:/root/.ssh + - ./server/proxy/ssl:/etc/apache2/ssl - ./env/magento/magento-vars.php:/app/magento-vars.php - ./env/magento/php.ini:/usr/local/etc/php/php.ini # - ~/.nvm:/var/www/.nvm From 29d19b005d00d8b8f0d183da4276d8d94ea8d920 Mon Sep 17 00:00:00 2001 From: Isaac Batista Date: Thu, 18 Jun 2020 17:54:19 -0500 Subject: [PATCH 13/13] The module for ssl has been enabled in the apache container. A configuration file was also created to activate the https protocol in apache --- Dockerfile/apache/Dockerfile | 3 ++- docker-compose.yml | 17 +++-------------- .../{ananda.ckt.conf => ananda.ckt.conf.old} | 18 +++++++++++++++++- server/proxy/vhost/ananda_apache.ckt.conf | 12 ++++++++++++ .../vhost/{default.conf => default.conf.old} | 0 5 files changed, 34 insertions(+), 16 deletions(-) rename server/proxy/vhost/{ananda.ckt.conf => ananda.ckt.conf.old} (57%) create mode 100644 server/proxy/vhost/ananda_apache.ckt.conf rename server/proxy/vhost/{default.conf => default.conf.old} (100%) diff --git a/Dockerfile/apache/Dockerfile b/Dockerfile/apache/Dockerfile index 054e96418b9..e4108ae1913 100644 --- a/Dockerfile/apache/Dockerfile +++ b/Dockerfile/apache/Dockerfile @@ -121,7 +121,8 @@ RUN chmod 777 -Rf /var/www /var/www/.* \ && usermod -u 1000 www-data \ && chsh -s /bin/bash www-data\ && a2enmod rewrite \ - && a2enmod headers + && a2enmod headers \ + && a2enmod ssl VOLUME /var/www/html WORKDIR /var/www/html diff --git a/docker-compose.yml b/docker-compose.yml index 600b4c5da91..77b733c2ca3 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,7 +23,7 @@ services: image: palomino/magento:apache # build: . ports: - - "8081:80" # web + - "80:80" # web - "443:443" - "9001:9000" # xdebug # - "35729:35729" # live reload @@ -33,6 +33,8 @@ services: - ~/.npm:/var/www/.npm - ~/.ssh:/root/.ssh - ./server/proxy/ssl:/etc/apache2/ssl + - ./server/proxy/vhost:/etc/apache2/sites-enabled + - ./server/proxy/logs:/var/www/ananda.ckt/logs - ./env/magento/magento-vars.php:/app/magento-vars.php - ./env/magento/php.ini:/usr/local/etc/php/php.ini # - ~/.nvm:/var/www/.nvm @@ -94,19 +96,6 @@ services: networks: - magento-network - proxy: - image: nginx:1.15 - ports: - - "80:80" - volumes: - - ./server/proxy/vhost:/etc/nginx/conf.d - - ./server/proxy/logs:/etc/nginx/logs - links: - - apache - networks: - - magento-network - restart: always - networks: magento-network: driver: bridge diff --git a/server/proxy/vhost/ananda.ckt.conf b/server/proxy/vhost/ananda.ckt.conf.old similarity index 57% rename from server/proxy/vhost/ananda.ckt.conf rename to server/proxy/vhost/ananda.ckt.conf.old index 0306bcb80f1..a21455809c3 100644 --- a/server/proxy/vhost/ananda.ckt.conf +++ b/server/proxy/vhost/ananda.ckt.conf.old @@ -3,19 +3,35 @@ upstream ananda.ckt { } server { + listen 80; listen [::]:80; + listen 443; + + if ($scheme = http) { + return 301 https://$server_name$request_uri; + } server_name ananda.ckt; access_log /etc/nginx/logs/ananda.ckt.access.log; error_log /etc/nginx/logs/ananda.ckt.error.log; + # Enable SSL + ssl on; + ssl_certificate /etc/nginx/ssl/ssl.crt; + ssl_certificate_key /etc/nginx/ssl/ssl.key; + ssl_session_timeout 10m; + # ssl_dhparam /etc/nginx/ssl/cert.pem; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP; + ssl_prefer_server_ciphers on; + gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript; location / { - proxy_pass http://ananda.ckt/; + proxy_pass https://ananda.ckt/; proxy_redirect off; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; diff --git a/server/proxy/vhost/ananda_apache.ckt.conf b/server/proxy/vhost/ananda_apache.ckt.conf new file mode 100644 index 00000000000..76fb2da72ea --- /dev/null +++ b/server/proxy/vhost/ananda_apache.ckt.conf @@ -0,0 +1,12 @@ + + SSLEngine on + SSLCertificateFile /etc/apache2/ssl/ssl.crt + SSLCertificateKeyFile /etc/apache2/ssl/ssl.key + ServerAdmin webmaster@wolfsellers.com + ServerName ananda.ckt + ServerAlias www.ananda.ckt + DocumentRoot /var/www/html/ + ErrorLog /var/www/ananda.ckt/logs/ananda_error.log + LogLevel warn + CustomLog /var/www/ananda.ckt/logs/ananda_access.log combined + \ No newline at end of file diff --git a/server/proxy/vhost/default.conf b/server/proxy/vhost/default.conf.old similarity index 100% rename from server/proxy/vhost/default.conf rename to server/proxy/vhost/default.conf.old