From 4ec6fd78387218913828a8fd779f6472af78ff7b Mon Sep 17 00:00:00 2001 From: David Losada Date: Tue, 25 Sep 2018 20:17:10 +0200 Subject: [PATCH] fix(docker): update image base versions and other container runtime stuff --- codeship-services.yml | 2 +- docker/build.Dockerfile | 2 +- docker/run.tasks.conf | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/codeship-services.yml b/codeship-services.yml index 787a0376d0..dd5158f66f 100644 --- a/codeship-services.yml +++ b/codeship-services.yml @@ -59,7 +59,7 @@ test: default_cache_branch: develop mysql: - image: mysql:5.6 + image: mysql:5.7 environment: - MYSQL_DATABASE=ushahidi - MYSQL_USER=ushahidi diff --git a/docker/build.Dockerfile b/docker/build.Dockerfile index 76c8b868c2..1ceff19d07 100644 --- a/docker/build.Dockerfile +++ b/docker/build.Dockerfile @@ -1,4 +1,4 @@ -FROM ushahidi/php-ci:php-5.6.30 +FROM ushahidi/php-ci:php-7.0 WORKDIR /var/www COPY composer.json ./ diff --git a/docker/run.tasks.conf b/docker/run.tasks.conf index 0989113d02..0988a4c227 100644 --- a/docker/run.tasks.conf +++ b/docker/run.tasks.conf @@ -1,7 +1,7 @@ platform.dataprovider.outgoing.service: { type: cron, directory: "/var/www", - command: "artisan dataprovider:outgoing", + command: "./artisan dataprovider:outgoing", interval: "* * * * */5", enabled: "$(ENABLE_PLATFORM_TASKS:-false)" } @@ -9,7 +9,7 @@ platform.dataprovider.outgoing.service: { platform.dataprovider.incoming.service: { type: cron, directory: "/var/www", - command: "artisan dataprovider:incoming", + command: "./artisan dataprovider:incoming", interval: "* * * * */5", enabled: "$(ENABLE_PLATFORM_TASKS:-false)" } @@ -17,7 +17,7 @@ platform.dataprovider.incoming.service: { platform.savedsearch.service: { type: cron, directory: "/var/www", - command: "artisan savedsearch:sync", + command: "./artisan savedsearch:sync", interval: "* * * * */5", enabled: "$(ENABLE_PLATFORM_TASKS:-false)" } @@ -25,7 +25,7 @@ platform.savedsearch.service: { platform.notification.queue.service: { type: cron, directory: "/var/www", - command: "artisan notification:queue", + command: "./artisan notification:queue", interval: "* * * * */5", enabled: "$(ENABLE_PLATFORM_TASKS:-false)" } @@ -33,7 +33,7 @@ platform.notification.queue.service: { platform.webhook.send.service: { type: cron, directory: "/var/www", - command: "artisan webhook:send", + command: "./artisan webhook:send", interval: "* * * * */5", enabled: "$(ENABLE_PLATFORM_TASKS:-false)" }