Add global-services to service command #5
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sagarnasit
changed the title
kirtangajjar
suggested changes
Sep 21, 2018
src/Service_Command.php
Outdated
| * Boots up the container if it is stopped or not running. | ||
| * @throws \EE\ExitException | ||
| */ | ||
| public static function nginx_proxy_check() { |
Contributor
There was a problem hiding this comment.
I think it would be more appropriate to move it onto a seperate util file like service-utils.php(To maintain consistency with other packages where functions which can be invoked by other packages are moved to a util file)
src/Service_Command.php
Outdated
| * | ||
| * @param Filesystem $fs Filesystem object to write file | ||
| */ | ||
| public static function generate_global_docker_compose_yml( Filesystem $fs ) { |
Contributor
There was a problem hiding this comment.
Since this function is also invoked by above function, it should also be moved to util file
kirtangajjar
previously approved these changes
Sep 23, 2018
Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>
Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>
Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>
Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>
mrrobot47
changed the title
Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>
mbtamuli
changed the title
mbtamuli
suggested changes
Sep 25, 2018
Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>
Signed-off-by: Riddhesh Sanghvi <riddheshsanghvi96@gmail.com>
mbtamuli
previously approved these changes
Sep 25, 2018
rahulsprajapati
suggested changes
Sep 25, 2018
src/helper/service-utils.php
Outdated
| } | ||
|
|
||
| $EE_CONF_ROOT = EE_CONF_ROOT; | ||
| if ( ! EE::docker()::docker_network_exists( GLOBAL_BACKEND_NETWORK ) ) { |
Contributor
There was a problem hiding this comment.
Why did you use two if conditions one after another instead of just using && ?
if (
! EE::docker()::docker_network_exists( GLOBAL_BACKEND_NETWORK ) &&
! EE::docker()::create_network( GLOBAL_BACKEND_NETWORK )
) {
src/helper/service-utils.php
Outdated
| EE::error( 'Unable to create network ' . GLOBAL_BACKEND_NETWORK ); | ||
| } | ||
| } | ||
| if ( ! EE::docker()::docker_network_exists( GLOBAL_FRONTEND_NETWORK ) ) { |
Contributor
There was a problem hiding this comment.
Same two if condition instead of just &&.
src/helper/service-utils.php
Outdated
| $container = 'ee-' . $service; | ||
| } | ||
| if ( ! EE::docker()::docker_network_exists( GLOBAL_BACKEND_NETWORK ) ) { | ||
| if ( ! EE::docker()::create_network( GLOBAL_BACKEND_NETWORK ) ) { |
Contributor
There was a problem hiding this comment.
Same.. two if condition instead of just &&.
rahulsprajapati
approved these changes
Sep 25, 2018
mbtamuli
approved these changes
Sep 25, 2018
Contributor
mbtamuli
left a comment
mbtamuli
left a comment
There was a problem hiding this comment.
Docker and config related changes look good to me.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue reference: EasyEngine/easyengine#1228