From 0b27635fcb9e85bc3a5d555e2e9a8e4c09dd6bea Mon Sep 17 00:00:00 2001
From: Nabeel S <nabeelio@users.noreply.github.com>
Date: Wed, 29 Sep 2021 10:14:46 -0400
Subject: [PATCH] Docker/compose updates (#1280)

* Docker/compose updates

* Fix container name

* Add zip to the ext install

* Don't mount the env.php file

* Use newer "docker compose" command

* Install composer

* Remove chown
---
 Dockerfile               | 17 +++++++++++------
 Makefile                 |  2 +-
 docker-compose.local.yml |  3 +--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index dea80223..89db36f4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,11 @@
-FROM php:7.4-fpm-alpine
+FROM php:8.0.9-fpm-alpine3.14
 
 WORKDIR /var/www/
 
-RUN apk add gmp-dev icu-dev zlib-dev libpng-dev
+# Setup composer
+COPY --from=composer:2.1.5 /usr/bin/composer /usr/local/bin/composer
+
+RUN apk add gmp-dev icu-dev zlib-dev libpng-dev libzip-dev zip
 RUN curl --silent --show-error https://getcomposer.org/installer | php
 
 # Copy any config files in
@@ -16,17 +19,19 @@ RUN docker-php-ext-install \
   pdo_mysql \
   gd \
   gmp \
-  opcache && \
-  docker-php-ext-enable pdo_mysql opcache
+  bcmath \
+  opcache \
+  zip && \
+  docker-php-ext-enable pdo_mysql opcache bcmath zip
 
 COPY . /var/www/
-RUN php composer.phar install \
+RUN composer install \
     --ignore-platform-reqs \
     --no-interaction \
     --no-plugins \
     --no-scripts \
     --prefer-dist
 
-RUN chown -R www-data:www-data /var/www
+#RUN chown -R www-data:www-data /var/www
 
 EXPOSE 9000
diff --git a/Makefile b/Makefile
index e0074254..7f3c233a 100644
--- a/Makefile
+++ b/Makefile
@@ -102,7 +102,7 @@ reset-installer:
 
 .PHONY: docker-test
 docker-test:
-	@docker-compose -f docker-compose.yml -f docker-compose.local.yml up
+	@docker compose -f docker-compose.yml -f docker-compose.local.yml up
 
 .PHONY: docker-clean
 docker-clean:
diff --git a/docker-compose.local.yml b/docker-compose.local.yml
index 7fbfa0be..69992405 100644
--- a/docker-compose.local.yml
+++ b/docker-compose.local.yml
@@ -24,9 +24,8 @@ services:
       - ./tests:/var/www/tests
       - ./composer.json:/var/www/composer.json
       - ./composer-lock.json:/var/www/composer-lock.json
-      - ./env.php:/var/www/env.php
+      #- ./env.php:/var/www/env.php
       - ./resources/docker/php/www.conf:/usr/local/etc/php-fpm.d/www.conf
-      - ./vendor:/var/www/vendor
     depends_on:
       - mysql
       - redis