Skip to content

Update ee-cron-scheduler with constant #1243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 11, 2018
Merged

Update ee-cron-scheduler with constant #1243

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3bb7ee
Update ee-cron-scheduler with constant
sagarnasit Oct 11, 2018
59a0064
Merge branch 'develop-v4' of github.com:EasyEngine/easyengine into up…
sagarnasit Oct 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions php/EE/Migration/Containers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ private static function migrate_global_containers() {
}

// Upgrade cron container
$existing_cron_image = EE::launch( 'docker inspect --format=\'{{.Config.Image}}\' ee-cron-scheduler', false, true );
$existing_cron_image = EE::launch( 'docker inspect --format=\'{{.Config.Image}}\' ' . EE_CRON_SCHEDULER, false, true );
if ( 0 === $existing_cron_image->return_code ) {
self::$rsp->add_step(
'upgrade-cron-container',
Expand Down Expand Up @@ -174,12 +174,12 @@ public static function nginxproxy_container_down( $existing_nginx_proxy_image )
*/
public static function cron_container_up() {
$cron_image = 'easyengine/cron:v' . EE_VERSION;
$cron_scheduler_run_command = 'docker run --name ee-cron-scheduler --restart=always -d -v ' . EE_ROOT_DIR . '/cron:/etc/ofelia:ro -v /var/run/docker.sock:/var/run/docker.sock:ro ' . $cron_image;
$cron_scheduler_run_command = 'docker run --name ' . EE_CRON_SCHEDULER . ' --restart=always -d -v ' . EE_ROOT_DIR . '/cron:/etc/ofelia:ro -v /var/run/docker.sock:/var/run/docker.sock:ro ' . $cron_image;

default_launch( 'docker rm -f ee-cron-scheduler', false, true );
default_launch( 'docker rm -f ' . EE_CRON_SCHEDULER, false, true );

if ( ! default_launch( $cron_scheduler_run_command, false, true ) ) {
throw new \Exception( ' Unable to upgrade ee-cron-scheduler container' );
throw new \Exception( ' Unable to upgrade ' . EE_CRON_SCHEDULER . ' container' );
}
}

Expand All @@ -192,12 +192,12 @@ public static function cron_container_up() {
*/
public static function cron_container_down( $existing_cron_image ) {
$cron_image = trim( $existing_cron_image->stdout );
$cron_scheduler_run_command = 'docker run --name ee-cron-scheduler --restart=always -d -v ' . EE_ROOT_DIR . '/cron:/etc/ofelia:ro -v /var/run/docker.sock:/var/run/docker.sock:ro ' . $cron_image;
$cron_scheduler_run_command = 'docker run --name ' . EE_CRON_SCHEDULER . ' --restart=always -d -v ' . EE_ROOT_DIR . '/cron:/etc/ofelia:ro -v /var/run/docker.sock:/var/run/docker.sock:ro ' . $cron_image;

default_launch( 'docker rm -f ee-cron-scheduler', false, true );
default_launch( 'docker rm -f ' . EE_CRON_SCHEDULER, false, true );

if ( ! default_launch( $cron_scheduler_run_command, false, true ) ) {
throw new \Exception( ' Unable to restore ee-cron-scheduler container' );
throw new \Exception( ' Unable to restore ' . EE_CRON_SCHEDULER . ' container' );
}
}

Expand Down