fix docker_mananger
This commit is contained in:
parent
303856344e
commit
58687e19a5
@ -142,7 +142,6 @@ handle_call({start_container, ContainerId}, _From, State) ->
|
|||||||
{reply, {error, Reason}, State}
|
{reply, {error, Reason}, State}
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
%% 停止服务, 主动停止的时候会改变服务配置的status字段
|
%% 停止服务, 主动停止的时候会改变服务配置的status字段
|
||||||
handle_call({stop_container, ContainerId, TimeoutSeconds}, _From, State = #state{}) ->
|
handle_call({stop_container, ContainerId, TimeoutSeconds}, _From, State = #state{}) ->
|
||||||
case docker_commands:stop_container(ContainerId, TimeoutSeconds) of
|
case docker_commands:stop_container(ContainerId, TimeoutSeconds) of
|
||||||
|
|||||||
@ -300,7 +300,7 @@ schedule_reconnect() ->
|
|||||||
|
|
||||||
-spec handle_container_request(message_pb:'ContainerRequest'()) -> ok.
|
-spec handle_container_request(message_pb:'ContainerRequest'()) -> ok.
|
||||||
handle_container_request(#'ContainerRequest'{action = {list, #'ContainerRequest.List'{all = _All}}}) ->
|
handle_container_request(#'ContainerRequest'{action = {list, #'ContainerRequest.List'{all = _All}}}) ->
|
||||||
case docker_manager:get_containers() of
|
case docker_commands:get_containers() of
|
||||||
{ok, Containers} ->
|
{ok, Containers} ->
|
||||||
{ok, jiffy:encode(Containers, [force_utf8])};
|
{ok, jiffy:encode(Containers, [force_utf8])};
|
||||||
{error, Reason} when is_binary(Reason) ->
|
{error, Reason} when is_binary(Reason) ->
|
||||||
@ -310,16 +310,16 @@ handle_container_request(#'ContainerRequest'{action = {deploy, #'ContainerReques
|
|||||||
docker_manager:deploy(TaskId, Params);
|
docker_manager:deploy(TaskId, Params);
|
||||||
handle_container_request(#'ContainerRequest'{action = {start, #'ContainerRequest.Start'{target = Target}}}) ->
|
handle_container_request(#'ContainerRequest'{action = {start, #'ContainerRequest.Start'{target = Target}}}) ->
|
||||||
ContainerTarget = container_target(Target),
|
ContainerTarget = container_target(Target),
|
||||||
docker_manager:start_container(ContainerTarget);
|
docker_commands:start_container(ContainerTarget);
|
||||||
handle_container_request(#'ContainerRequest'{action = {stop, #'ContainerRequest.Stop'{target = Target, timeout_seconds = TimeoutSeconds }}}) ->
|
handle_container_request(#'ContainerRequest'{action = {stop, #'ContainerRequest.Stop'{target = Target, timeout_seconds = TimeoutSeconds }}}) ->
|
||||||
ContainerTarget = container_target(Target),
|
ContainerTarget = container_target(Target),
|
||||||
docker_manager:stop_container(ContainerTarget, TimeoutSeconds);
|
docker_commands:stop_container(ContainerTarget, TimeoutSeconds);
|
||||||
handle_container_request(#'ContainerRequest'{action = {kill, #'ContainerRequest.Kill'{target = Target, signal = Signal}}}) ->
|
handle_container_request(#'ContainerRequest'{action = {kill, #'ContainerRequest.Kill'{target = Target, signal = Signal}}}) ->
|
||||||
ContainerTarget = container_target(Target),
|
ContainerTarget = container_target(Target),
|
||||||
docker_manager:kill_container(ContainerTarget, to_binary(Signal));
|
docker_commands:kill_container(ContainerTarget, to_binary(Signal));
|
||||||
handle_container_request(#'ContainerRequest'{action = {remove, #'ContainerRequest.Remove'{target = Target, force = Force, remove_volumes = RemoveVolumes}}}) ->
|
handle_container_request(#'ContainerRequest'{action = {remove, #'ContainerRequest.Remove'{target = Target, force = Force, remove_volumes = RemoveVolumes}}}) ->
|
||||||
ContainerTarget = container_target(Target),
|
ContainerTarget = container_target(Target),
|
||||||
docker_manager:remove_container(ContainerTarget, to_bool(Force), to_bool(RemoveVolumes));
|
docker_commands:remove_container(ContainerTarget, to_bool(Force), to_bool(RemoveVolumes));
|
||||||
handle_container_request(#'ContainerRequest'{action = {config, #'ContainerRequest.Config'{target = Target, config = Config}}}) ->
|
handle_container_request(#'ContainerRequest'{action = {config, #'ContainerRequest.Config'{target = Target, config = Config}}}) ->
|
||||||
ContainerTarget = container_target(Target),
|
ContainerTarget = container_target(Target),
|
||||||
docker_manager:config_container(ContainerTarget, iolist_to_binary(Config)).
|
docker_manager:config_container(ContainerTarget, iolist_to_binary(Config)).
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user