Use original entrypoint

likesistemas · May 7, 2024 · ba7d35a · ba7d35a
1 parent f3ec31c
commit ba7d35a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,6 +8,7 @@ services:
   app:
     image: likesistemas/php:latest
     container_name: nginx_app
+    command: sleep 4
     environment:
       - PHP_NAME=nginx_app
       - PHP_PM=dynamic
@@ -42,6 +43,25 @@ services:
     networks:
       - nginx
 
+  nginx_timeout:
+    image: likesistemas/nginx:dev
+    build:
+      context: .
+      args: 
+        - PHP_FPM_PASSWORD=$PHP_FPM_PASSWORD
+    container_name: nginx_timeout
+    restart: always
+    environment:
+      - HOST_PHP=nginx_app
+      - PORTA_PHP=9000
+      - TIMEOUT_PHP=2s
+    ports:
+      - 83:80
+    volumes:
+      - ./www/:/var/www/public/
+    networks:
+      - nginx
+
   nginx_rewrite:
     image: likesistemas/nginx:dev-rewrite
     build:
@@ -137,8 +157,8 @@ services:
       - app
     networks:
       - nginx
-  
-  nginx_filebeat:
+
+  nginx_filebeat2:
     image: likesistemas/nginx:dev-filebeat
     build:
       context: .

diff --git a/sh/02-wait-php.sh b/sh/02-wait-php.sh
@@ -3,8 +3,5 @@
 if [ -n "$HOST_PHP" ]; then
 	dockerize \
 		-wait tcp://${HOST_PHP}:${PORTA_PHP} \
-		-timeout ${TIMEOUT_PHP} \
-	&& start_nginx
-else
-	start_nginx
-fi
+		-timeout ${TIMEOUT_PHP} || exit 1
+fi