浏览代码

Updated README with new PHP Docker tags

Mark Shust 4 年之前
父节点
当前提交
84e72e3c58
共有 1 个文件被更改,包括 5 次插入22 次删除
  1. 5 22
      README.md

+ 5 - 22
README.md

@@ -92,13 +92,15 @@ View Dockerfiles:
   - 8.0 (available for alpha testing)
   - 8.0 (available for alpha testing)
       - [`8.0-fpm-develop`](https://github.com/markshust/docker-magento/tree/master/images/php/8.0)
       - [`8.0-fpm-develop`](https://github.com/markshust/docker-magento/tree/master/images/php/8.0)
   - 7.4
   - 7.4
-      - [`7.4-fpm`, `7.4-fpm-4`](https://github.com/markshust/docker-magento/tree/master/images/php/7.4)
+      - [`7.4-fpm`, `7.4-fpm-5`](https://github.com/markshust/docker-magento/tree/master/images/php/7.4)
+      - [`7.4-fpm-4`](https://github.com/markshust/docker-magento/tree/36.0.2/images/php/7.4)
       - [`7.4-fpm-3`](https://github.com/markshust/docker-magento/tree/36.0.1/images/php/7.4)
       - [`7.4-fpm-3`](https://github.com/markshust/docker-magento/tree/36.0.1/images/php/7.4)
       - [`7.4-fpm-2`](https://github.com/markshust/docker-magento/tree/34.2.0/images/php/7.4)
       - [`7.4-fpm-2`](https://github.com/markshust/docker-magento/tree/34.2.0/images/php/7.4)
       - [`7.4-fpm-1`](https://github.com/markshust/docker-magento/tree/34.1.0/images/php/7.4)
       - [`7.4-fpm-1`](https://github.com/markshust/docker-magento/tree/34.1.0/images/php/7.4)
       - [`7.4-fpm-0`](https://github.com/markshust/docker-magento/tree/33.0.0/images/php/7.4)
       - [`7.4-fpm-0`](https://github.com/markshust/docker-magento/tree/33.0.0/images/php/7.4)
   - 7.3
   - 7.3
-      - [`7.3-fpm`, `7.3-fpm-11`](https://github.com/markshust/docker-magento/tree/master/images/php/7.3)
+      - [`7.3-fpm`, `7.3-fpm-12`](https://github.com/markshust/docker-magento/tree/master/images/php/7.3)
+      - [`7.3-fpm-11`](https://github.com/markshust/docker-magento/tree/36.0.2/images/php/7.3)
       - [`7.3-fpm-10`](https://github.com/markshust/docker-magento/tree/36.0.1/images/php/7.3)
       - [`7.3-fpm-10`](https://github.com/markshust/docker-magento/tree/36.0.1/images/php/7.3)
       - [`7.3-fpm-9`](https://github.com/markshust/docker-magento/tree/34.2.0/images/php/7.3)
       - [`7.3-fpm-9`](https://github.com/markshust/docker-magento/tree/34.2.0/images/php/7.3)
       - [`7.3-fpm-8`](https://github.com/markshust/docker-magento/tree/34.1.0/images/php/7.3)
       - [`7.3-fpm-8`](https://github.com/markshust/docker-magento/tree/34.1.0/images/php/7.3)
@@ -173,20 +175,6 @@ curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/te
 # Download the version of Magento you want to use with:
 # Download the version of Magento you want to use with:
 bin/download 2.4.1
 bin/download 2.4.1
 
 
-# If the download fails, the script will attempt to download Magento with Composer
-
-# or if you'd rather install with Composer, run:
-#
-# OPEN SOURCE:
-#
-# rm -rf src
-# composer create-project --repository=https://repo.magento.com/ --ignore-platform-reqs --prefer-dist magento/project-community-edition=2.4.1 src
-#
-# COMMERCE:
-#
-# rm -rf src
-# composer create-project --repository=https://repo.magento.com/ --ignore-platform-reqs --prefer-dist magento/project-enterprise-edition=2.4.1 src
-
 # Create a DNS host entry for the site:
 # Create a DNS host entry for the site:
 echo "127.0.0.1 ::1 magento2.test" | sudo tee -a /etc/hosts
 echo "127.0.0.1 ::1 magento2.test" | sudo tee -a /etc/hosts
 
 
@@ -210,14 +198,9 @@ cp -R ~/Sites/existing src
 echo "127.0.0.1 ::1 yoursite.test" | sudo tee -a /etc/hosts
 echo "127.0.0.1 ::1 yoursite.test" | sudo tee -a /etc/hosts
 
 
 # Start some containers, copy files to them and then restart the containers:
 # Start some containers, copy files to them and then restart the containers:
-docker-compose up -d
-rm -rf src/vendor
+docker-compose -f docker-compose.yml up -d
 bin/copytocontainer --all ## Initial copy will take a few minutes...
 bin/copytocontainer --all ## Initial copy will take a few minutes...
 
 
-# Install composer dependencies, then copy artifacts back to the host (for debugging purposes):
-bin/composer install
-bin/copyfromcontainer vendor
-
 # Import existing database:
 # Import existing database:
 bin/mysql < backups/magento.sql
 bin/mysql < backups/magento.sql