From af109b2d7ded7f45951e4f2b01b16208c680a138 Mon Sep 17 00:00:00 2001
From: Leonardo Lemos <leonardo.lemos@convenia.com.br>
Date: Fri, 27 May 2022 12:13:02 -0300
Subject: [PATCH] add test script inside the image

---
 Dockerfile              | 5 ++++-
 docker-compose.test.yml | 5 +----
 run_tests.sh            | 4 +++-
 3 files changed, 8 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 run_tests.sh

diff --git a/Dockerfile b/Dockerfile
index c4a5523..324c730 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,12 +29,15 @@ RUN addgroup -S -g $GID app && adduser -u $UID -G app -D app
 COPY ./docker/php-fpm.d/www.conf /usr/local/etc/php-fpm.d/www.conf
 COPY ./docker/supervisor/supervisord.conf /etc/supervisord.conf
 COPY ./docker/nginx/default.conf /etc/nginx/http.d/default.conf
+# For Automated Tests on Docker Hub
+COPY ./docker/nginx/default.conf /etc/nginx/http.d/default.conf
+COPY ./run_tests.sh /run_tests.sh
 
 #Enable production configuration
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 
 ADD ./public /var/www/app/public
-RUN chown -R app:app /var/www/app
+RUN chown -R app:app /var/www/app && chmod +x /run_tests.sh
 
 WORKDIR /var/www/app
 
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 9fdffd5..71e3fbf 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -1,7 +1,4 @@
 services:
   sut:
-    user: app:app
     build: .
-    volumes:
-      - ./run_tests.sh:/var/www/app/run_tests.sh
-    command: cd /var/www/app && run_tests.sh
\ No newline at end of file
+    command: /run_tests.sh
\ No newline at end of file
diff --git a/run_tests.sh b/run_tests.sh
old mode 100644
new mode 100755
index b2f821c..27cbd43
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
+supervisord &
+sleep 5
+cd /var/www/app
 rm -rf public
 rm supervisord.pid
-rm run.sh
 composer create-project laravel/laravel .
 curl --fail 127.0.0.1
\ No newline at end of file