Преглед на файлове

Added new bin/cron to start cron service #540

Mark Shust преди 3 години
родител
ревизия
1d9b25cb20

+ 1 - 0
README.md

@@ -246,6 +246,7 @@ It is recommended to keep your root docker config files in one repository, and y
 - `bin/composer`: Run the composer binary. Ex. `bin/composer install`
 - `bin/copyfromcontainer`: Copy folders or files from container to host. Ex. `bin/copyfromcontainer vendor`
 - `bin/copytocontainer`: Copy folders or files from host to container. Ex. `bin/copytocontainer --all`
+- `bin/cron`: Start or stop the cron service. Ex. `bin/cron start`
 - `bin/dev-urn-catalog-generate`: Generate URN's for PHPStorm and remap paths to local host. Restart PHPStorm after running this command.
 - `bin/devconsole`: Alias for `bin/n98-magerun2 dev:console`
 - `bin/download`: Download specific Magento version from Composer to `/var/www/html` directory within the container. Ex. `bin/download 2.4.3-p1 community`

+ 2 - 1
compose/Makefile

@@ -28,6 +28,7 @@ help:
 	@echo "$(call format,make,composer,'Run the composer binary.')"
 	@echo "$(call format,make,copyfromcontainer,'Copy folders or files from container to host.')"
 	@echo "$(call format,make,copytocontainer,'Copy folders or files from host to container.')"
+	@echo "$(call format,make,cron,'Start or stop the cron service.')"
 	@echo "$(call format,make,dev-urn-catalog-generate,'Generate URNs for PHPStorm and remap paths to local host.')"
 	@echo "$(call format,make,devconsole,'Alias for n98-magerun2 dev:console.')"
 	@echo "$(call format,make,devtools-cli-check,'Check & install the CLI devtools if missing from system.')"
@@ -175,4 +176,4 @@ update:
 	@./bin/update
 
 xdebug:
-	@./bin/xdebug $(call args)
+	@./bin/xdebug $(call args)

+ 5 - 0
compose/bin/cron

@@ -0,0 +1,5 @@
+#!/bin/bash
+[ -z "$1" ] && echo "Please specify a CLI command (ex. ls)" && exit
+bin/root service cron "$@"
+bin/root touch /var/www/html/var/.setup_cronjob_status /var/www/html/var/.update_cronjob_status
+bin/root chown app:app /var/www/html/var/.setup_cronjob_status /var/www/html/var/.update_cronjob_status

+ 0 - 4
compose/docker-compose.dev.yml

@@ -36,10 +36,6 @@ services:
     ports:
       - "1080:1080"
 
-  ## Disabling cron by default as it uses higher CPU, enable if needed
-  #cron:
-  #  volumes: *appvolumes
-
   # Disabling selenium by default as it is not required for all use cases
   #selenium:
   #  image: selenium/standalone-chrome-debug:3.8.1

+ 0 - 10
compose/docker-compose.yml

@@ -62,16 +62,6 @@ services:
     environment:
       - RABBITMQ_VM_MEMORY_HIGH_WATERMARK=1GB
 
-  ## Disabling cron by default as it uses higher CPU, enable if needed
-  #cron:
-  #  image: markoshust/magento-php:7.4-fpm-9
-  #  user: root
-  #  command: /usr/local/bin/cronstart
-  #  tty: true
-  #  links:
-  #    - db
-  #  volumes: *appvolumes
-
 volumes:
   appdata:
   dbdata:

+ 0 - 1
images/php/7.3/Dockerfile

@@ -95,7 +95,6 @@ RUN curl -s https://packages.blackfire.io/gpg.key | apt-key add - \
 COPY conf/www.conf /usr/local/etc/php-fpm.d/
 COPY conf/php.ini /usr/local/etc/php/
 COPY conf/php-fpm.conf /usr/local/etc/
-COPY bin/cronstart /usr/local/bin/
 
 RUN mkdir -p /etc/nginx/html /var/www/html /sock \
   && chown -R app:app /etc/nginx /var/www /usr/local/etc/php/conf.d /sock

+ 0 - 7
images/php/7.3/bin/cronstart

@@ -1,7 +0,0 @@
-#!/bin/bash
-service cron start
-
-touch /var/www/html/var/.setup_cronjob_status /var/www/html/var/.update_cronjob_status
-chown app:app /var/www/html/var/.setup_cronjob_status /var/www/html/var/.update_cronjob_status
-
-/usr/bin/crontab

+ 0 - 1
images/php/7.4/Dockerfile

@@ -95,7 +95,6 @@ RUN curl -s https://packages.blackfire.io/gpg.key | apt-key add - \
 COPY conf/www.conf /usr/local/etc/php-fpm.d/
 COPY conf/php.ini /usr/local/etc/php/
 COPY conf/php-fpm.conf /usr/local/etc/
-COPY bin/cronstart /usr/local/bin/
 
 RUN mkdir -p /etc/nginx/html /var/www/html /sock \
   && chown -R app:app /etc/nginx /var/www /usr/local/etc/php/conf.d /sock

+ 0 - 7
images/php/7.4/bin/cronstart

@@ -1,7 +0,0 @@
-#!/bin/bash
-service cron start
-
-touch /var/www/html/var/.setup_cronjob_status /var/www/html/var/.update_cronjob_status
-chown app:app /var/www/html/var/.setup_cronjob_status /var/www/html/var/.update_cronjob_status
-
-/usr/bin/crontab

+ 0 - 1
images/php/8.0/Dockerfile

@@ -78,7 +78,6 @@ RUN curl -s https://packages.blackfire.io/gpg.key | apt-key add - \
 COPY conf/www.conf /usr/local/etc/php-fpm.d/
 COPY conf/php.ini /usr/local/etc/php/
 COPY conf/php-fpm.conf /usr/local/etc/
-COPY bin/cronstart /usr/local/bin/
 
 RUN mkdir -p /etc/nginx/html /var/www/html /sock \
   && chown -R app:app /etc/nginx /var/www /usr/local/etc/php/conf.d /sock

+ 0 - 7
images/php/8.0/bin/cronstart

@@ -1,7 +0,0 @@
-#!/bin/bash
-service cron start
-
-touch /var/www/html/var/.setup_cronjob_status /var/www/html/var/.update_cronjob_status
-chown app:app /var/www/html/var/.setup_cronjob_status /var/www/html/var/.update_cronjob_status
-
-/usr/bin/crontab