Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
DBRepo
Manage
Activity
Members
Labels
Plan
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FAIR Data Austria DB Repository
DBRepo
Merge requests
!161
Something went wrong on our end
Resolve "Frontend bugs"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Expand sidebar
Merged
Resolve "Frontend bugs"
314-frontend-bugs
into
dev
Overview
0
Commits
6
Pipelines
0
Changes
3
Merged
Resolve "Frontend bugs"
Martin Weise
requested to merge
314-frontend-bugs
into
dev
May 19, 2023
Overview
0
Commits
6
Pipelines
0
Changes
3
Closes #314
0
0
Merge request reports
Viewing commit
300c3c1d
Prev
Next
Show latest version
3 files
+
52
−
40
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
3
Unverified
300c3c1d
Fixed the test
· 300c3c1d
Martin Weise
authored
May 20, 2023
dbrepo-container-service/rest-service/src/main/java/at/tuwien/endpoints/ContainerEndpoint.java
+
3
−
7
View file @ 300c3c1d
Edit in single-file editor
Open in Web IDE
Show full file
@@ -156,16 +156,12 @@ public class ContainerEndpoint {
public
ResponseEntity
<
ContainerDto
>
findById
(
@NotNull
@PathVariable
(
"id"
)
Long
containerId
)
throws
DockerClientException
,
ContainerNotFoundException
{
log
.
debug
(
"endpoint find container, id={}"
,
containerId
);
final
Container
container
=
containerService
.
find
(
containerId
);
final
ContainerDto
dto
=
containerMapper
.
containerToContainerDto
(
container
);
final
ContainerDto
inspect
;
ContainerDto
dto
;
try
{
inspect
=
containerService
.
inspect
(
containerId
);
dto
.
setIpAddress
(
inspect
.
getIpAddress
());
dto
.
setRunning
(
inspect
.
getRunning
());
dto
.
setState
(
inspect
.
getState
());
dto
=
containerService
.
inspect
(
containerId
);
}
catch
(
ContainerNotRunningException
e
)
{
/* ignore */
dto
=
containerMapper
.
containerToContainerDto
(
containerService
.
find
(
containerId
));
dto
.
setRunning
(
false
);
dto
.
setState
(
ContainerStateDto
.
EXITED
);
}
Loading