Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
C
containers
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
argo
containers
Commits
a09400ed
Commit
a09400ed
authored
Oct 08, 2018
by
Kamil Iskra
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'delete-fix' into 'master'
Delete fix Closes
#1
See merge request
!4
parents
2fc34abb
51af8112
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
argo_nodeos_config.cpp
src/argo_nodeos_config.cpp
+1
-0
container_manager.cpp
src/container_manager.cpp
+3
-1
No files found.
src/argo_nodeos_config.cpp
View file @
a09400ed
...
...
@@ -647,6 +647,7 @@ bool parse_for_node_config(int argc, char** argv, Container_manager& cm)
{
case
OV_HELP
:
case
OV_ON_ERROR
:
case
OV_LOG
:
break
;
//handled elsewhere
case
OV_SHOW_AVAILABLE_RESOURCES
:
cm
.
show_available_resources
(
optarg
?
optarg
:
""
);
...
...
src/container_manager.cpp
View file @
a09400ed
...
...
@@ -579,6 +579,7 @@ void Container_manager::delete_container(string command)
sleep
(
1
);
cc
->
remove
();
bool
deleted
=
false
;
vector
<
Argo_container
*>::
iterator
it
;
for
(
it
=
_containers
.
begin
();
it
!=
_containers
.
end
();
it
++
)
{
...
...
@@ -589,10 +590,11 @@ void Container_manager::delete_container(string command)
_logger
->
log
(
LOG_TYPE_INFO
,
"Container "
+
cc
->
get_name
()
+
" deleted."
);
delete
cc
;
deleted
=
true
;
break
;
}
}
assert
(
_containers
.
empty
()
||
it
!=
_containers
.
end
()
);
assert
(
deleted
);
}
void
Container_manager
::
alter_container
(
string
command
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment