Merge pull request #52 from magento-commerce/develop-to-1.2

Merge develop into 1.2

Author: shiftedreality

.gitignore

@@ -6,4 +6,6 @@
 /auth.json
 /_workdir
 /_workdir_cache
+/venv
+/*.code-workspace
 .phpunit.result.cache

LICENSE_MIT.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) Meanbee and Taylor Otwell
+Copyright (c) Meanbee, Taylor Otwell and Mage Inferno
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

bin/init-docker.sh

@@ -55,7 +55,7 @@ domain_is_valid()
 
 composer_install()
 {
-    docker run --rm -e "MAGENTO_ROOT=/app" -v "$(pwd)":/app -v ~/.composer/cache:/root/.composer/cache "magento/magento-cloud-docker-php:${PHP_VERSION}-cli-${IMAGE_VERSION}" composer install --ansi
+    docker run --rm -e "MAGENTO_ROOT=/app" -v "$(pwd)":/app -v ~/.composer/cache:/composer/cache "magento/magento-cloud-docker-php:${PHP_VERSION}-cli-${IMAGE_VERSION}" composer install --ansi
 }
 
 add_host()

composer.json

@@ -2,15 +2,15 @@
     "name": "magento/magento-cloud-docker",
     "description": "Magento Cloud Docker",
     "type": "magento2-component",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
     "require": {
         "php": "^7.2",
         "ext-json": "*",
-        "composer/composer": "^1.0",
+        "composer/composer": "^1.0||^2.0",
         "composer/semver": "^1.0",
         "illuminate/config": "^5.5",
         "symfony/config": "^4.4",

dist/bin/magento-docker

@@ -6,7 +6,8 @@ USAGE="Magento Cloud Docker
 
 \033[33mArguments:\033[0m
   pull              pull latest images
-  up                destroy, re-create and start containers
+  init              destroy, re-create and start containers and volumes
+  up                create or start containers
   down              destroy containers
   bash              connect to bash
   stop              stop containers
@@ -23,15 +24,61 @@ USAGE="Magento Cloud Docker
   php 7.2           run a command in a PHP 7.2 container
   php 7.3           run a command in a PHP 7.3 container
   php 7.4           run a command in a PHP 7.4 container
+  php 8.0           run a command in a PHP 8.0 container
+  copy-to           copy to container (use --all or specific file/directory)
+  copy-from         copy from container (use --all or specific file/directory)
+  fix-owns          fix ownership to www:www
 
 \033[33mOptions:\033[0m
   -h            show this help text\n"
 
+function fix-owns() {
+    if [ -z "$1" ]; then
+        docker-compose exec -u root -T fpm chown -R www:www /app
+    else
+        docker-compose exec -u root -T fpm chown -R www:www /app/"$1"
+    fi
+}
+
+function copy-to() {
+    [ -z "$1" ] && echo "Please specify a directory or file to copy to container (ex. vendor, --all)" && exit
+
+    if [ "$1" == "--all" ]; then
+        docker cp "./" "$(docker-compose ps -q fpm | awk '{print $1}')":/app/
+        echo "Completed copying all files from host to container"
+        fix-owns
+    else
+        if [ -f "../$1" ]; then
+            docker cp "./${1}" "$(docker-compose ps -q fpm | awk '{print $1}')":/app/"$1"
+        else
+            docker cp "./${1}" "$(docker-compose ps -q fpm | awk '{print $1}')":/app/"$(dirname "$1")"
+        fi
+        echo "Completed copying $1 from host to container"
+        fix-owns "$1"
+    fi
+}
+
+function copy-from() {
+    [ -z "$1" ] && echo "Please specify a directory or file to copy from container (ex. vendor, --all)" && exit
+
+    if [ "$1" == "--all" ]; then
+        docker cp "$(docker-compose ps -q fpm | awk '{print $1}')":/app/ "./"
+        echo "Completed copying all files from container to host"
+    else
+        if [ -f "$1" ]; then
+            docker cp "$(docker-compose ps -q fpm | awk '{print $1}')":/app/"$1" "./$1"
+        else
+            docker cp "$(docker-compose ps -q fpm | awk '{print $1}')":/app/"$1" "./$(dirname "$1")"
+        fi
+        echo "Completed copying $1 from container to host"
+    fi
+}
+
 if [ ${#@} -ne 0 ]; then
     for arg in "$@"; do
         if [ "${arg#"-h"}" = "" ]; then
             printf "$USAGE"
-            exit 0;
+            exit 0
         fi
     done
 fi;
@@ -40,12 +87,20 @@ case "$1" in
     pull)
         docker-compose pull
         ;;
+    init)
+        read -p "Any existing data volumes will be removed. Are you sure? [y/N] " -r
+        echo
+        if [[ $REPLY =~ ^[Yy]$ ]]
+        then
+            docker-compose down --volumes
+            docker-compose up --detach
+        fi
+        ;;
     up)
-        docker-compose down --volumes
         docker-compose up --detach
         ;;
     down)
-        docker-compose down --volumes
+        docker-compose down
         ;;
     bash)
         docker-compose run --rm deploy bash
@@ -86,7 +141,7 @@ case "$1" in
         version="$2"
         shift 2
         # allow ssh-agent forwarding for composer.json files that need access to private repos
-        if [[ $(uname) = Darwin ]]; then
+        if [[ $(uname) == Darwin ]]; then
             # https://docs.docker.com/docker-for-mac/osxfs/#ssh-agent-forwarding (D4M > 2.2)
             export SSH_AUTH_SOCK="/run/host-services/ssh-auth.sock"
         fi
@@ -95,7 +150,17 @@ case "$1" in
             --mount "type=bind,src=$SSH_AUTH_SOCK,target=$SSH_AUTH_SOCK" -e SSH_AUTH_SOCK="$SSH_AUTH_SOCK" \
             "magento/magento-cloud-docker-php:${version}-cli-1.1" "$@"
         ;;
+    copy-to)
+        copy-to $2
+        ;;
+    copy-from)
+        copy-from $2
+        ;;
+    fix-owns)
+        fix-owns
+        ;;
     *)
         printf "$USAGE"
-        exit 0;
+        exit 0
+        ;;
 esac

images/elasticsearch/6.8/Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:6.8.8
+FROM docker.elastic.co/elasticsearch/elasticsearch:6.8.15
 
 RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
 RUN echo "discovery.type: single-node" >> /usr/share/elasticsearch/config/elasticsearch.yml

images/elasticsearch/7.11/Dockerfile

@@ -0,0 +1,15 @@
+FROM docker.elastic.co/elasticsearch/elasticsearch:7.11.2
+
+RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
+RUN echo "discovery.type: single-node" >> /usr/share/elasticsearch/config/elasticsearch.yml
+RUN bin/elasticsearch-plugin install -b analysis-icu && \
+    bin/elasticsearch-plugin install -b analysis-phonetic
+
+ADD docker-healthcheck.sh /docker-healthcheck.sh
+ADD docker-entrypoint.sh /docker-entrypoint.sh
+
+HEALTHCHECK --retries=3 CMD ["bash", "/docker-healthcheck.sh"]
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+
+EXPOSE 9200 9300

images/elasticsearch/7.11/docker-entrypoint.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -eo pipefail
+
+if [[ -n "$ES_PLUGINS" ]]; then
+  echo "Intalling plugins: $ES_PLUGNS"
+  for PLUGIN in $ES_PLUGINS
+  do
+      ./bin/elasticsearch-plugin install -b "$PLUGIN"
+  done
+fi
+
+/bin/bash /usr/local/bin/docker-entrypoint.sh

images/elasticsearch/7.11/docker-healthcheck.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -eo pipefail
+
+if health="$(curl -fsSL "http://${ES_HOST:-elasticsearch}:${ES_PORT:-9200}/_cat/health?h=status")"; then
+  health="$(echo "$health" | sed -r 's/^[[:space:]]+|[[:space:]]+$//g')" # trim whitespace (otherwise we'll have "green ")
+  if [ "$health" = 'green' ] || [ "$health" = 'yellow' ]; then
+    exit 0
+  fi
+  echo >&2 "Unexpected health status: $health"
+fi
+
+exit 1

images/php/7.2-cli/Dockerfile

@@ -1,14 +1,14 @@
 # This file is automatically generated. Do not edit directly. #
-FROM php:7.2-cli-buster
-ARG GOSU_VERSION=1.11
+FROM php:7.2-cli
+ARG COMPOSER_VERSION=1.10.22
 
 ENV COMPOSER_MEMORY_LIMIT -1
 ENV PHP_MEMORY_LIMIT 2G
 ENV MAGENTO_ROOT /app
 ENV DEBUG false
 ENV MAGENTO_RUN_MODE production
-ENV UPDATE_UID_GID false
 ENV COMPOSER_ALLOW_SUPERUSER 1
+ENV COMPOSER_HOME /composer
 ENV ENABLE_SENDMAIL true
 
 ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sysvmsg sysvsem sysvshm xsl zip pcntl
@@ -69,7 +69,7 @@ RUN pip3 install --upgrade setuptools \
 RUN npm install -g grunt-cli
 
 # Install MailHog
-RUN wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+RUN curl -L -O https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
     && sudo chmod +x mhsendmail_linux_amd64 \
     && sudo mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail
 
@@ -138,15 +138,15 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
   && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
 RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
   && rm -f /usr/local/lib/php/extensions/*/*sodium.so \
-  && apt-get remove libsodium* -y  \
-  && mkdir -p /tmp/libsodium  \
+  && apt-get remove libsodium* -y \
+  && mkdir -p /tmp/libsodium \
   && curl -sL https://github.com/jedisct1/libsodium/archive/1.0.18-RELEASE.tar.gz | tar xzf - -C  /tmp/libsodium \
   && cd /tmp/libsodium/libsodium-1.0.18-RELEASE/ \
   && ./configure \
   && make && make check \
-  && make install  \
+  && make install \
   && cd / \
-  && rm -rf /tmp/libsodium  \
+  && rm -rf /tmp/libsodium \
   && pecl install -o -f libsodium
 RUN cd /tmp \
   && curl -O https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz \
@@ -157,59 +157,14 @@ RUN cd /tmp \
   && rm -rf ./ioncube \
   && rm ioncube_loaders_lin_x86-64.tar.gz
 
-RUN docker-php-ext-enable \
-  bcmath \
-  blackfire \
-  bz2 \
-  calendar \
-  exif \
-  gd \
-  geoip \
-  gettext \
-  gmp \
-  gnupg \
-  igbinary \
-  imagick \
-  imap \
-  intl \
-  ldap \
-  mailparse \
-  msgpack \
-  mysqli \
-  oauth \
-  opcache \
-  pcov \
-  pdo_mysql \
-  propro \
-  pspell \
-  raphf \
-  recode \
-  redis \
-  shmop \
-  soap \
-  sockets \
-  sodium \
-  ssh2 \
-  sysvmsg \
-  sysvsem \
-  sysvshm \
-  tidy \
-  xdebug \
-  xmlrpc \
-  xsl \
-  yaml \
-  zip \
-  pcntl \
-  ioncube
-
 ADD etc/php-cli.ini /usr/local/etc/php/conf.d/zz-magento.ini
 ADD etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini
 ADD etc/php-pcov.ini /usr/local/etc/php/conf.d/zz-pcov-settings.ini
 ADD etc/mail.ini /usr/local/etc/php/conf.d/zz-mail.ini
 ADD etc/php-gnupg.ini /usr/local/etc/php/conf.d/gnupg.ini
 
 # Get composer installed to /usr/local/bin/composer
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --version=1.10.16 --filename=composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --version=${COMPOSER_VERSION} --filename=composer
 
 ADD bin/* /usr/local/bin/
 
@@ -234,10 +189,12 @@ RUN mkdir -p ${MAGENTO_ROOT}
 
 VOLUME ${MAGENTO_ROOT}
 
-ENTRYPOINT ["/docker-entrypoint.sh"]
+RUN chown -R www:www /usr/local /var/www /var/log /usr/local/etc/php/conf.d ${MAGENTO_ROOT} /composer
 
-USER root
+ENTRYPOINT ["/docker-entrypoint.sh"]
 
 WORKDIR ${MAGENTO_ROOT}
 
+USER root
+
 CMD ["bash"]