added supervisord with cron job

Author: Dmitriy

Makefile

@@ -34,6 +34,9 @@ env-prod:
 ssh:
 	@docker-compose $(project) exec laravel bash
 
+ssh-supervisord:
+	@docker-compose $(project) exec supervisord bash
+
 exec:
 	@docker-compose $(project) exec laravel $$cmd
 

docker-compose-ci.yml

@@ -16,6 +16,21 @@ services:
         - "443:443"
       depends_on:
         - mysql
+      links:
+        - mysql
+
+    supervisord:
+      image: laravel:latest
+      build:
+        context: .
+        dockerfile: ./docker/development/Dockerfile
+      container_name: supervisord
+      user: root
+      depends_on:
+        - mysql
+      links:
+        - mysql
+      command: ["/usr/bin/supervisord"]
 
     mysql:
       image: mysql:8.0
@@ -24,8 +39,6 @@ services:
       environment:
         - MYSQL_ROOT_PASSWORD=secret
         - MYSQL_DATABASE=laravel
-      expose:
-        - "33061"
       ports:
         - "33061:3306"
       volumes:

docker-compose-prod.yml

@@ -16,6 +16,21 @@ services:
         - "443:443"
       depends_on:
         - mysql
+      links:
+        - mysql
+
+    supervisord:
+      image: laravel:latest
+      build:
+        context: .
+        dockerfile: ./docker/development/Dockerfile
+      container_name: supervisord
+      user: root
+      depends_on:
+        - mysql
+      links:
+        - mysql
+      command: ["/usr/bin/supervisord"]
 
     mysql:
       image: mysql:8.0
@@ -24,8 +39,6 @@ services:
       environment:
         - MYSQL_ROOT_PASSWORD=secret
         - MYSQL_DATABASE=laravel
-      expose:
-        - "33061"
       ports:
         - "33061:3306"
       volumes:

docker-compose.yml

@@ -18,6 +18,21 @@ services:
         - .:/var/www/laravel
       depends_on:
         - mysql
+      links:
+        - mysql
+
+    supervisord:
+      image: laravel:latest
+      build:
+        context: .
+        dockerfile: ./docker/development/Dockerfile
+      container_name: supervisord
+      user: root
+      depends_on:
+        - mysql
+      links:
+        - mysql
+      command: ["/usr/bin/supervisord"]
 
     mysql:
       image: mysql:8.0
@@ -26,8 +41,6 @@ services:
       environment:
         - MYSQL_ROOT_PASSWORD=secret
         - MYSQL_DATABASE=laravel
-      expose:
-        - "33061"
       ports:
         - "33061:3306"
       volumes:

docker/development/Dockerfile

@@ -10,6 +10,8 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
       libxml2 \
       libxml2-dev \
       libreadline-dev \
+      supervisor \
+      cron \
     && rm -r /var/lib/apt/lists/* \
     && docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd \
     && docker-php-ext-install \
@@ -40,6 +42,12 @@ COPY ./docker/hosts/laravel-ssl.conf /etc/apache2/sites-available/laravel-ssl.co
 RUN a2dissite 000-default.conf && a2ensite laravel.conf && a2ensite laravel-ssl
 COPY ./docker/development/php.ini /usr/local/etc/php/php.ini
 
+# add supervisor
+RUN mkdir -p /var/log/supervisor
+COPY --chown=root:root ./docker/other/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+COPY --chown=root:root ./docker/other/cron /var/spool/cron/crontabs/root
+RUN chmod 0600 /var/spool/cron/crontabs/root
+
 # generate certificates
 RUN openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private/ssl-cert-snakeoil.key -out /etc/ssl/certs/ssl-cert-snakeoil.pem -subj "/C=AT/ST=Vienna/L=Vienna/O=Security/OU=Development/CN=example.com"
 

docker/other/cron

@@ -0,0 +1 @@
+* * * * * cd /var/www/laravel && /usr/local/bin/php artisan schedule:run > /proc/1/fd/1 2>/proc/1/fd/2

docker/other/supervisord.conf

@@ -0,0 +1,7 @@
+[supervisord]
+nodaemon=true
+
+[program:cron]
+command=/usr/sbin/cron -l 2 -f
+autostart=true
+autorestart=true

docker/production/Dockerfile

@@ -10,6 +10,8 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
       libxml2 \
       libxml2-dev \
       libreadline-dev \
+      supervisor \
+      cron \
     && rm -r /var/lib/apt/lists/* \
     && docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd \
     && docker-php-ext-install \
@@ -36,6 +38,12 @@ COPY ./docker/hosts/laravel-ssl.conf /etc/apache2/sites-available/laravel-ssl.co
 RUN a2dissite 000-default.conf && a2ensite laravel.conf && a2ensite laravel-ssl
 COPY ./docker/production/php.ini /usr/local/etc/php/php.ini
 
+# add supervisor
+RUN mkdir -p /var/log/supervisor
+COPY --chown=root:root ./docker/other/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+COPY --chown=root:root ./docker/other/cron /var/spool/cron/crontabs/root
+RUN chmod 0600 /var/spool/cron/crontabs/root
+
 # generate certificates. TODO: change it
 RUN openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private/ssl-cert-snakeoil.key -out /etc/ssl/certs/ssl-cert-snakeoil.pem -subj "/C=AT/ST=Vienna/L=Vienna/O=Security/OU=Development/CN=example.com"
 

readme.md

@@ -62,6 +62,7 @@ Note: OS recommendation - Linux Ubuntu based.
     make stop
     make restart
     make ssh
+    make ssh-supervisord
     make composer-install
     make composer-update
     make info