From 6fcbd603ba75d0e61df96dd1f0b0020fa8e386cc Mon Sep 17 00:00:00 2001
From: Nabeel S <nabeelio@users.noreply.github.com>
Date: Thu, 16 Jan 2020 11:49:22 -0500
Subject: [PATCH] Add base Dockerfile for Dockerhub builds (#504)

---
 .dockerignore                   |  1 +
 .travis/deploy_script.sh        |  1 +
 Dockerfile                      | 28 ++++++++++++++++++++++++++++
 docker-compose.yml              |  3 ++-
 resources/docker/php/Dockerfile |  2 --
 5 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 .dockerignore
 create mode 100644 Dockerfile

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..22d0d82f
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+vendor
diff --git a/.travis/deploy_script.sh b/.travis/deploy_script.sh
index 1b4570ba..652471cd 100755
--- a/.travis/deploy_script.sh
+++ b/.travis/deploy_script.sh
@@ -50,6 +50,7 @@ if [ "$TRAVIS" = "true" ]; then
     .travis
     docker
     _ide_helper.php
+    .dockerignore
     .dpl
     .editorconfig
     .eslintignore
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..8460bfb7
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,28 @@
+FROM php:7.4-fpm-alpine
+
+WORKDIR /var/www/
+
+RUN apk add gmp-dev
+RUN curl --silent --show-error https://getcomposer.org/installer | php
+
+# Copy any config files in
+COPY resources/docker/php/ext-opcache.ini $PHP_INI_DIR/conf.d/
+COPY resources/docker/php/www.conf /usr/local/etc/php-fpm.d/www.conf
+RUN ln -sf /dev/stderr /var/log/fpm-error.log
+
+RUN docker-php-ext-install \
+  calendar \
+  pdo_mysql \
+  gmp \
+  opcache && \
+  docker-php-ext-enable pdo_mysql opcache
+
+COPY . /var/www/
+RUN php composer.phar install \
+    --ignore-platform-reqs \
+    --no-interaction \
+    --no-plugins \
+    --no-scripts \
+    --prefer-dist
+
+EXPOSE 9000
diff --git a/docker-compose.yml b/docker-compose.yml
index 8f35a4fc..5a1ad1e7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,8 +2,9 @@
 version: '3'
 services:
   app:
+    # For your own docker-compose, use `image: phpvms:latest` instead of the build/context block
     build:
-      context: ./resources/docker/php
+      context: .
     environment:
       DB_HOST: mysql
       REDIS_HOST: redis
diff --git a/resources/docker/php/Dockerfile b/resources/docker/php/Dockerfile
index beb782e6..9b5df89a 100644
--- a/resources/docker/php/Dockerfile
+++ b/resources/docker/php/Dockerfile
@@ -1,7 +1,5 @@
 FROM php:7.3-fpm-alpine
 
-#RUN apt-get update
-#RUN apt-get install -y libgmp-dev
 RUN apk add gmp-dev
 
 # Copy any config files in