Merge pull request #646 from boxuk/improvement/docker-commands

[REFACTOR] Improvements to the way Docker commands are run

bin/docker/clearcache

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-docker-compose exec --user www-data app ./bin/clearcache "$@";
+bin/docker/php ./bin/clearcache "$@";

bin/docker/composer

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-docker-compose exec -T --user www-data app php -d memory_limit=1G /usr/local/bin/composer "$@"
+bin/docker/php /usr/local/bin/composer "$@"

bin/docker/nodejs

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# if node is already running, use it
+
+if [ "$(docker inspect -f '{{.State.Running}}' nodejs 2>/dev/null)" = "true" ]; then
+  docker exec -it nodejs "$@"
+else
+  docker compose run --rm nodejs "$@"
+fi

bin/docker/npm

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-docker compose -f docker-compose.yml run -T --rm --workdir /usr/src/app nodejs npm "$@"
+bin/docker/nodejs npm "$@"

bin/docker/php

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# If container is running, exec inside, else run a new container
+if [ "$(docker inspect -f '{{.State.Running}}' app 2>/dev/null)" = "true" ]; then
+    docker-compose exec --user www-data app php -d memory_limit=1G "$@"
+else
+    docker-compose run --rm --user www-data app php -d memory_limit=1G "$@"
+fi

bin/docker/phpstan

@@ -1,4 +1,3 @@
-
 #!/usr/bin/env bash
 
 bin/docker/composer run phpstan "$@"

bin/docker/wp

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-docker-compose exec --user www-data app php -d memory_limit=1G /usr/local/bin/wp "$@"
+bin/docker/php /usr/local/bin/wp "$@"

docker-compose.yml → compose.yml

@@ -29,13 +29,6 @@ services:
     extra_hosts:
       - host.docker.internal:host-gateway
       - '${LOOPBACK_HOST_NAME}:192.168.35.10' # IP should match the IP address set for nginx below
-    depends_on:
-      database:
-          condition: service_healthy
-      mailpit:
-          condition: service_healthy
-      memcached:
-          condition: service_healthy
     healthcheck:
       test: ["CMD", "php", "-v"]
       interval: 10s
@@ -58,9 +51,6 @@ services:
     extra_hosts:
       - host.docker.internal:host-gateway
       - '${LOOPBACK_HOST_NAME}:192.168.35.10' # IP should match the IP address set for nginx below
-    depends_on:
-      app:
-        condition: service_healthy
     healthcheck:
       test: ["CMD", "php", "-v"]
       interval: 10s
@@ -83,6 +73,12 @@ services:
         condition: service_healthy
       app_xdebug:
         condition: service_healthy
+      database:
+          condition: service_healthy
+      mailpit:
+          condition: service_healthy
+      memcached:
+          condition: service_healthy
     links:
       - app
       - app_xdebug
@@ -105,6 +101,7 @@ services:
 
   nodejs:
     build: docker/node
+    working_dir: /usr/src/app
     volumes:
       - '.:/usr/src/app:cached'
       - './node_modules:/usr/src/app/node_modules:delegated'