From 37c4ecbf74796e2d4bed25517e40a59b8e0f477a Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Wed, 18 Jul 2018 15:50:22 +0800
Subject: [PATCH] updated port to port 80

---
 Dockerfile               |  2 +-
 docker-prod.yml          |  8 ++++----
 docker/deploy/Dockerfile | 22 ----------------------
 3 files changed, 5 insertions(+), 27 deletions(-)
 delete mode 100644 docker/deploy/Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 36b86a07..710f7957 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,5 +11,5 @@ RUN php artisan clear-compiled
 
 COPY wait.sh /usr/local/bin/wait.sh
 RUN chmod +x /usr/local/bin/wait.sh
-CMD /usr/local/bin/wait.sh && composer update --no-scripts && composer dumpautoload && php artisan storage:link && php artisan migrate && php artisan serve --host=0.0.0.0 --port=8000
+CMD /usr/local/bin/wait.sh && composer update --no-scripts && composer dumpautoload && php artisan storage:link && php artisan migrate && php artisan serve --host=0.0.0.0 --port=80
 EXPOSE 8000
diff --git a/docker-prod.yml b/docker-prod.yml
index 100f23a3..e0dac035 100644
--- a/docker-prod.yml
+++ b/docker-prod.yml
@@ -1,11 +1,11 @@
 version: '2'
 services:
 
-  #  The Application
+  # api
   app:
     build: .
     ports:
-      - "8000:8000"
+      - "80:80"
     volumes:
       - .:/app
     env_file: .env
@@ -16,7 +16,7 @@ services:
       - database
 
 
-  ### Caddy Server #########################################
+  # caddy Server 
   caddy:
     build: ./caddy
     volumes:
@@ -30,7 +30,7 @@ services:
       - app
 
 
-  # The Database
+  # database
   database:
     image: mysql:5.6
     volumes:
diff --git a/docker/deploy/Dockerfile b/docker/deploy/Dockerfile
deleted file mode 100644
index 6917aaaf..00000000
--- a/docker/deploy/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM shakyshane/laravel-php:latest
-
-COPY composer.lock composer.json /var/www/
-
-COPY database /var/www/database
-
-WORKDIR /var/www
-
-RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-    && php -r "if (hash_file('SHA384', 'composer-setup.php') === '55d6ead61b29c7bdee5cccfb50076874187bd9f21f65d8991d46ec5cc90518f447387fb9f76ebae1fbbacf329e583e30') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
-    && php composer-setup.php \
-    && php -r "unlink('composer-setup.php');" \
-    && php composer.phar install --no-dev --no-scripts \
-    && rm composer.phar
-
-COPY . /var/www
-
-RUN chown -R www-data:www-data \
-        /var/www/storage \
-        /var/www/bootstrap/cache
-
-RUN php artisan optimize
\ No newline at end of file