From b7ade4d2de5c54312d0cbf9f5da94b8910ad059d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Monta=C3=B1ez?= Date: Fri, 19 Feb 2021 00:26:39 -0300 Subject: [PATCH] Update dockers --- README.md | 2 +- docs/dockers/docker-compose.yml | 18 +++--------------- docs/dockers/php5/Dockerfile | 9 --------- docs/dockers/php7.1/Dockerfile | 9 --------- docs/dockers/{php7.0 => php7.4}/Dockerfile | 7 +++++-- 5 files changed, 9 insertions(+), 36 deletions(-) delete mode 100644 docs/dockers/php5/Dockerfile delete mode 100644 docs/dockers/php7.1/Dockerfile rename docs/dockers/{php7.0 => php7.4}/Dockerfile (56%) diff --git a/README.md b/README.md index 5ade28b7..33532116 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Simply add the following dependency to your project’s composer.json file: Finally you can use **Magallanes** from the vendor's bin: ```bash -$ vendor/bin/mage version +vendor/bin/mage version ``` ### Codename Discovery One diff --git a/docs/dockers/docker-compose.yml b/docs/dockers/docker-compose.yml index 9bd212f7..6ba830ce 100644 --- a/docs/dockers/docker-compose.yml +++ b/docs/dockers/docker-compose.yml @@ -1,19 +1,7 @@ version: '2' services: - php5: - container_name: mage-php5 - build: ./php5 - volumes: - - ../../:/home/magephp - - php7.0: - container_name: mage-php7.0 - build: ./php7.0 - volumes: - - ../../:/home/magephp - - php7.1: - container_name: mage-php7.1 - build: ./php7.1 + php7.4: + container_name: mage-php7.4 + build: ./php7.4 volumes: - ../../:/home/magephp diff --git a/docs/dockers/php5/Dockerfile b/docs/dockers/php5/Dockerfile deleted file mode 100644 index c7918b43..00000000 --- a/docs/dockers/php5/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM ubuntu:14.04 - -RUN apt-get update && apt-get upgrade -y -RUN apt-get install -y vim curl git unzip -RUN apt-get install -y php5-cli php5-curl - -RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer - -WORKDIR /home/magephp diff --git a/docs/dockers/php7.1/Dockerfile b/docs/dockers/php7.1/Dockerfile deleted file mode 100644 index 53607a2d..00000000 --- a/docs/dockers/php7.1/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM ubuntu:17.10 - -RUN apt-get update && apt-get upgrade -y -RUN apt-get install -y vim curl git unzip -RUN apt-get install -y php7.1-cli php-zip php7.1-curl php7.1-xml php7.1-mbstring - -RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer - -WORKDIR /home/magephp diff --git a/docs/dockers/php7.0/Dockerfile b/docs/dockers/php7.4/Dockerfile similarity index 56% rename from docs/dockers/php7.0/Dockerfile rename to docs/dockers/php7.4/Dockerfile index f1da4b49..abafc3b2 100644 --- a/docs/dockers/php7.0/Dockerfile +++ b/docs/dockers/php7.4/Dockerfile @@ -1,8 +1,11 @@ -FROM ubuntu:16.04 +FROM ubuntu:20.04 + +ENV DEBIAN_FRONTEND=noninteractive \ + TZ=UTC RUN apt-get update && apt-get upgrade -y RUN apt-get install -y vim curl git unzip -RUN apt-get install -y php7.0-cli php-zip php7.0-curl php7.0-xml +RUN apt-get install -y php7.4-cli php-zip php7.4-curl php7.4-xml php7.4-mbstring php7.4-xdebug RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer