Merge pull request #10 from movabletype/fix-for-new-docker-compose

Fix for new docker compose

Author: usualoma

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Enable to start service via.
     * e.g. DOCKER\_MT\_SERVICES=postfix
+* Support docker-compose 2.x
 
 ### Fixed
 

mt/cgi.yml

@@ -3,3 +3,6 @@ services:
   mt:
     restart: always
     command: "/usr/sbin/httpd -D FOREGROUND"
+
+  mt-watcher:
+    command: "/bin/true"

mt/common.yml

@@ -17,6 +17,8 @@ services:
       - "support:/var/www/cgi-bin/mt/mt-static/support"
       # override entrypoint
       - "./docker-entrypoint.sh:/usr/local/bin/docker-entrypoint.sh"
+    labels:
+      mt-dev.service: "mt"
 
   httpd:
     image: ${DOCKER_HTTPD_IMAGE:-movabletype/test:php-7.3}
@@ -38,7 +40,16 @@ services:
     command: apache2-foreground
 
   mt-watcher:
-    image: busybox
+    build:
+      context: mt-watcher
+    working_dir: /var/www/cgi-bin/mt
+    environment:
+      PERL_FNS_NO_OPT: ${PERL_FNS_NO_OPT:-0}
+      DISABLE_MT_WATCHER: ${DISABLE_MT_WATCHER:-0}
+    volumes:
+      - "${MT_HOME_PATH:-../../movabletype}:/var/www/cgi-bin/mt"
+      - "./mt-watcher.pl:/usr/local/lib/mt/bin/mt-watcher.pl"
+      - /var/run/docker.sock:/var/run/docker.sock
 
 volumes:
   site:

mt/mt-watcher.pl

@@ -31,7 +31,8 @@
             return unless @paths;
 
             print( join( "\n", @paths ) . "\n" );
-            system('docker kill -s HUP mt_mt_1');
+            my $mt_container_id = `docker ps -q --filter label=mt-dev.service=mt`;
+            system("docker kill -s HUP $mt_container_id");
 
             # throttling
             sleep(1);

mt/psgi.yml

@@ -7,16 +7,6 @@ services:
       MT_PID_FILE_PATH: ${MT_PID_FILE_PATH:-/tmp/mt.psgi.pid}
     volumes:
       - "./plackup-mt:/usr/local/lib/mt/bin/plackup-mt"
+
   mt-watcher:
-    build:
-      context: mt-watcher
-    image: movabletype/mt-watcher
-    working_dir: /var/www/cgi-bin/mt
     command: /usr/local/lib/mt/bin/mt-watcher.pl
-    environment:
-      PERL_FNS_NO_OPT: ${PERL_FNS_NO_OPT:-0}
-      DISABLE_MT_WATCHER: ${DISABLE_MT_WATCHER:-0}
-    volumes:
-      - "${MT_HOME_PATH:-../../movabletype}:/var/www/cgi-bin/mt"
-      - "./mt-watcher.pl:/usr/local/lib/mt/bin/mt-watcher.pl"
-      - /var/run/docker.sock:/var/run/docker.sock